diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 8344 |
1 files changed, 4490 insertions, 3854 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.28.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-07-10 09:53+0800\n" -"PO-Revision-Date: 2020-07-11 17:50+0100\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2020-12-21 08:08+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -18,232 +18,232 @@ 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:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: 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:3336 +#: 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:4110 builtin/checkout.c:294 +#: add-interactive.c:729 apply.c:4125 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:1691 git-add--interactive.perl:1368 +#: 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:1689 git-add--interactive.perl:1370 +#: 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:1378 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Uppdatera patch" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: 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:1868 +#: 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:1865 +#: 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:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 bugreport.c:135 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 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 #: git-add--interactive.perl:213 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:1782 +#: 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:1430 +#: 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:1431 +#: 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:1432 +#: 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:1433 +#: 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:1436 +#: 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:1437 +#: 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:1438 +#: 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:1439 +#: 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:1442 +#: 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:1443 +#: 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:1444 +#: 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:1445 +#: 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:1448 +#: 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:1449 +#: 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:1450 +#: 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:1451 +#: 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:1454 -#: git-add--interactive.perl:1472 +#: 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:1455 -#: git-add--interactive.perl:1473 +#: 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:1456 -#: git-add--interactive.perl:1474 +#: 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:1457 -#: git-add--interactive.perl:1475 +#: 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:1460 +#: 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:1461 +#: 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:1462 +#: 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:1463 +#: 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:1466 +#: 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:1467 +#: 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:1468 +#: 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:1469 +#: 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,?]? " @@ -524,34 +524,34 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen\n" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "kunde inte tolka styckehuvudet \"%.*s\"" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "kunde inte tolka diff" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "kunde inte tolka färgad diff" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "misslyckades att köra \"%s\"" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "omaka utdata från interactive.diffFilter" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -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:776 +#: 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:791 +#: 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:1067 git-add--interactive.perl:1114 +#: 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:1071 +#: 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:1085 git-add--interactive.perl:1128 +#: 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:1118 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "kunde inte tolka styckehuvud" -#: add-patch.c:1163 +#: 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:1232 git-add--interactive.perl:1241 +#: 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:1275 +#: 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:1276 git-add--interactive.perl:1345 +#: 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:1283 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: add-patch.c:1340 +#: 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:1463 add-patch.c:1473 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "Inget föregående stycke" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "Inget följande stycke" -#: add-patch.c:1484 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "Inga andra stycken att gå till" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: 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:1496 git-add--interactive.perl:1596 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "gå till vilket stycke? " -#: add-patch.c:1507 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Ogiltigt siffervärde: \"%s\"" -#: add-patch.c:1512 +#: 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:1521 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "Inga andra stycken att söka efter" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: add-patch.c:1542 +#: 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:1559 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "Inga stycken motsvarar givet mönster" -#: add-patch.c:1566 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Beklagar, kan inte dela stycket" -#: add-patch.c:1570 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Dela i %d stycken." -#: add-patch.c:1574 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" -#: add-patch.c:1625 +#: 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:1353 +#: 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:61 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" @@ -1121,7 +1121,7 @@ msgstr "sökvägen %s har ändrat namn/tagits bort" msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" @@ -1171,360 +1171,355 @@ msgstr "%s: fel typ" msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3939 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3959 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3964 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3984 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3988 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4003 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4095 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4102 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4105 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4114 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4124 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4262 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4296 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4302 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4310 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4359 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4363 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4433 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4531 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4539 +#: apply.c:4554 msgid "internal error" msgstr "internt fel" -#: apply.c:4542 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4553 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4575 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4579 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4698 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4706 +#: apply.c:4726 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4726 +#: apply.c:4746 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4883 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4910 +#: apply.c:4930 #, 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:4916 apply.c:4931 +#: apply.c:4936 apply.c:4951 #, 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:4924 +#: apply.c:4944 #, 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:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4960 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:4968 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4971 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "antal" -#: apply.c:4974 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4977 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4979 +#: apply.c:4999 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:4983 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4985 +#: apply.c:5005 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:4987 +#: apply.c:5007 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:4989 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4991 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4993 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4995 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4998 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:5020 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:5002 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 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:5007 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "åtgärd" -#: apply.c:5009 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5012 apply.c:5015 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5018 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5020 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5022 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5024 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 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:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5027 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5030 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "rot" -#: apply.c:5033 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "kan inte läsa %s" - -#: archive-tar.c:465 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:468 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:475 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "sökvägen är inte giltig UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" @@ -1548,134 +1543,156 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "kan inte läsa %s" + +#: 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\"" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "ingen sådan referens: %.*s" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "objektnamnet är inte giltigt: %s" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog är inte spårad" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Hittar inte filen: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "Inte en vanlig fil: %s" + +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:464 +#: archive.c:555 msgid "archive format" msgstr "arkivformat" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "prefix" -#: archive.c:466 +#: 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:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: 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 +#: 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:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 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:468 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "ta med ospårade filer i arkivet" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:470 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:471 +#: archive.c:565 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:472 -msgid "store only" -msgstr "endast spara" - -#: archive.c:473 -msgid "compress faster" -msgstr "komprimera snabbare" - -#: archive.c:481 -msgid "compress better" -msgstr "komprimera bättre" +#: archive.c:567 +msgid "set compression level" +msgstr "välj komprimeringsgrad" -#: archive.c:484 +#: archive.c:570 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: 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:487 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:488 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:489 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:496 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:498 +#: 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:500 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:522 +#: 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:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:529 +#: 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." @@ -1683,22 +1700,22 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:745 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:770 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1707,7 +1724,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:775 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1716,7 +1733,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:780 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1725,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:788 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1736,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:801 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1748,36 +1765,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:840 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:890 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:920 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:966 builtin/merge.c:151 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:997 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:1019 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:1028 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -1786,7 +1803,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:1057 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1796,7 +1813,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: 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" @@ -1817,11 +1834,11 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: 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" @@ -1985,88 +2002,104 @@ msgstr "\"%s\" är redan utcheckad på \"%s\"" msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\"" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' ser inte ut som en v2-bundle-fil" +msgid "unknown capability '%s'" +msgstr "okänd kapabilitet \"%s\"" -#: bundle.c:69 -msgid "unknown hash algorithm length" -msgstr "okänd hashningsalgoritmlängd" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" -#: bundle.c:84 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: 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'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "behöver ett arkiv för att verifiera ett paket (bundle)." -#: bundle.c:217 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:224 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:226 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:353 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:402 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "version %d för paket (bundle) stöds ej" + +#: bundle.c:500 +#, c-format +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:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:489 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:499 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:524 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack dog" @@ -2075,250 +2108,236 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:238 +#: commit-graph.c:188 midx.c:47 +msgid "invalid hash version" +msgstr "felaktig hashnings-version" + +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:303 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:310 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:317 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:339 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "" -"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " -"ofullständig" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" -#: commit-graph.c:349 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:417 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:491 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:501 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:549 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:573 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:727 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:1036 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "Skriver Bloom-filterindex för ändrade sökvägar" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "Skriver Bloom-filterdata för ändrade sökvägar" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1257 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1274 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1294 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1313 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1367 +#: commit-graph.c:1406 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1423 +#: commit-graph.c:1483 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1447 +#: commit-graph.c:1508 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1460 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1464 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1503 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1518 -msgid "Counting distinct commits in commit graph" -msgstr "Räknar olika incheckningar i incheckningsgraf" - -#: commit-graph.c:1550 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1599 +#: commit-graph.c:1628 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1646 +#: commit-graph.c:1683 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1651 +#: commit-graph.c:1688 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1728 +#: commit-graph.c:1758 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1773 +#: commit-graph.c:1803 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1789 +#: commit-graph.c:1819 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1809 +#: commit-graph.c:1839 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1935 +#: commit-graph.c:1965 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:1946 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "oväntat duplicerat inchecknings-id %s" - -#: commit-graph.c:1969 +#: commit-graph.c:2009 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2156 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" +#: commit-graph.c:2115 +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:2167 +#: commit-graph.c:2214 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2260 +#: commit-graph.c:2307 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:2270 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2327 commit-graph.c:2342 #, 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:2287 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2305 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2320 +#: commit-graph.c:2367 #, 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:2327 +#: commit-graph.c:2374 #, 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:2337 +#: commit-graph.c:2384 #, 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:2346 +#: commit-graph.c:2393 #, 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:2360 +#: commit-graph.c:2407 #, 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:2365 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2326,7 +2345,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2369 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2334,20 +2353,20 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2385 +#: commit-graph.c:2432 #, 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:2391 +#: commit-graph.c:2438 #, 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:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 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" @@ -2451,7 +2470,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:2456 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -2594,7 +2613,7 @@ msgstr "felformat värde för %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" @@ -2623,101 +2642,101 @@ msgstr "kunde inte tolka %s" msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2113 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2283 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2328 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2374 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2376 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2457 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2489 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2518 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2770 config.c:3094 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2781 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2816 builtin/config.c:344 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2841 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2854 config.c:3107 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2865 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2874 config.c:3112 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2959 config.c:3209 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2993 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: 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:3085 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3252 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2886,25 +2905,25 @@ msgstr "ssh-varianten \"simple\" stöder inte val av port" msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1407 +#: connect.c:1408 msgid "unable to fork" msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" @@ -2980,40 +2999,40 @@ msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" -#: convert.c:688 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3022,16 +3041,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -3049,17 +3068,17 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält" msgid "refusing to work with credential missing protocol field" msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url innehåller radbrytning i komponenten %s: %s" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "url saknar protokoll: %s" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "kan inte tolka url för inloggingsuppgifter: %s" @@ -3156,6 +3175,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>" @@ -3218,35 +3257,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4243 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4589 +#: 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:4592 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4670 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4718 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: 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:4755 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3255,42 +3294,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4840 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4864 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4878 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4928 diff.c:4934 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4946 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4967 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4986 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5026 +#: diff.c:5063 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3298,149 +3337,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5062 diff.c:5082 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5219 +#: diff.c:5223 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" + +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5275 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5298 +#: diff.c:5351 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5300 diff.c:5306 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "<n>" msgstr "<n>" -#: diff.c:5309 diff.c:5312 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5314 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5317 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5321 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5325 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5328 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5330 diff.c:5338 +#: diff.c:5383 diff.c:5391 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5331 +#: diff.c:5384 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:5335 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5339 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5343 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5346 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5349 +#: diff.c:5402 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5352 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5354 +#: diff.c:5407 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5355 +#: diff.c:5408 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "<width>" msgstr "<bredd>" -#: diff.c:5358 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5361 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5364 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5366 +#: diff.c:5419 msgid "<count>" msgstr "<antal>" -#: diff.c:5367 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5370 +#: diff.c:5423 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5373 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5376 +#: diff.c:5429 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:5378 +#: diff.c:5431 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5379 +#: diff.c:5432 msgid "<kind>" msgstr "<typ>" -#: diff.c:5380 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3448,7 +3492,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5383 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3456,87 +3500,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5387 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5390 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5393 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5396 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5399 +#: diff.c:5452 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:5403 diff.c:5408 diff.c:5413 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "<char>" msgstr "<tecken>" -#: diff.c:5404 +#: diff.c:5457 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:5409 +#: diff.c:5462 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:5414 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5417 +#: diff.c:5470 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5418 +#: diff.c:5471 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5419 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5423 +#: diff.c:5476 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5427 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5430 +#: diff.c:5483 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5434 +#: diff.c:5487 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:5436 +#: diff.c:5489 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5439 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5441 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5444 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3544,159 +3588,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5446 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5448 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5451 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5454 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5457 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5460 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5463 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5466 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +msgid "<regex>" +msgstr "<reguttr>" + +#: diff.c:5519 +msgid "ignore changes whose all lines match <regex>" +msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" + +#: diff.c:5522 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:5469 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5473 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5475 +#: diff.c:5531 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5476 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5478 +#: diff.c:5534 msgid "<text>" msgstr "<text>" -#: diff.c:5479 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "<mode>" msgstr "<läge>" -#: diff.c:5482 +#: diff.c:5538 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5484 diff.c:5487 diff.c:5532 -msgid "<regex>" -msgstr "<reguttr>" - -#: diff.c:5485 +#: diff.c:5541 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:5488 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5491 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5494 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5497 +#: diff.c:5553 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5499 +#: diff.c:5555 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:5503 +#: diff.c:5559 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5505 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5507 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5509 +#: diff.c:5565 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5511 +#: diff.c:5567 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5513 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5515 +#: diff.c:5571 msgid "<when>" msgstr "<när>" -#: diff.c:5516 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5519 +#: diff.c:5575 msgid "<format>" msgstr "<format>" -#: diff.c:5520 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5524 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5527 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5529 +#: diff.c:5585 msgid "<string>" msgstr "<sträng>" -#: diff.c:5530 +#: diff.c:5586 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:5533 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3704,54 +3752,54 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5536 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5539 +#: diff.c:5595 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:5542 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5543 +#: diff.c:5599 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5544 +#: diff.c:5600 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:5546 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5547 +#: diff.c:5603 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5549 +#: diff.c:5605 msgid "<file>" msgstr "<fil>" -#: diff.c:5550 +#: diff.c:5606 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6205 +#: diff.c:6263 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:6208 +#: diff.c:6266 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:6211 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3767,61 +3815,61 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: dir.c:573 +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" -#: dir.c:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "okänt mönster: %s" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "okänt negativt mönster: %s" -#: dir.c:804 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera " "gånger" -#: dir.c:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3502 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3547 dir.c:3552 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3581 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3855,246 +3903,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:152 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:155 +#: 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:166 +#: 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:186 +#: 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:197 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:259 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: 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:416 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:433 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:464 +#: fetch-pack.c:482 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:756 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:821 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:829 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:910 +#: 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:927 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:929 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:976 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: 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:983 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1043 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1048 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1052 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1054 +#: 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:1071 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1211 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1235 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1242 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1286 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1304 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1310 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1371 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1376 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1386 +#: 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:1388 +#: 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:1430 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1477 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1482 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1487 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1517 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1921 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1944 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:1971 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1974 +#: 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" @@ -4117,7 +4165,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" @@ -4125,18 +4173,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" @@ -4193,41 +4241,41 @@ msgstr "Lågnivåkommandon / synka arkiv" msgid "Low-level Commands / Internal Helpers" msgstr "Lågnivåkommandon / interna hjälpare" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:363 git.c:99 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "De vanliga Git-vägledningarna är:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Vägledningar för Git-koncept:" -#: help.c:427 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "Externa kommandon" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "Kommadoalias" -#: help.c:511 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4236,32 +4284,32 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:570 +#: 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:592 +#: 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:597 +#: 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:602 +#: 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:610 -#, 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:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4275,16 +4323,16 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -#: help.c:654 +#: help.c:675 msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4298,7 +4346,15 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Författar-identitet okänd\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Incheckar-identitet okänd\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4324,66 +4380,66 @@ msgstr "" "Kör utan --global för att endast ändra i aktuellt arkiv.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "ingen e-post angavs och autodetektering är inaktiverad" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "inget namn angavs och autodetektering är inaktiverad" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "kunde inte autodetektera namn (fick \"%s\")" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "tomt ident-namn (för <%s>) ej tillåtet" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" -#: list-objects-filter-options.c:144 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "förväntade någonting efter combine:" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon" @@ -4441,6 +4497,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" @@ -4753,7 +4824,7 @@ msgstr "tillägg/tillägg" msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3101 git-submodule.sh:959 +#: merge-recursive.c:3101 msgid "submodule" msgstr "undermodul" @@ -4832,46 +4903,32 @@ 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" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3549 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3562 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3612 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3671 -#, 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:3768 +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -4879,171 +4936,171 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 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:68 +#: 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:84 +#: 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:89 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:94 +#: midx.c:106 #, c-format -msgid "hash version %u does not match" -msgstr "hash-versionen %u stämmer inte" +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:108 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:132 +#: 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:145 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:147 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:149 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:151 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:165 +#: 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:208 +#: 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:258 +#: 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:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "fel när paketfiler från multi-pack-index skulle förberedas" - -#: midx.c:470 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:476 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:536 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:840 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" -#: midx.c:873 +#: 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:925 +#: midx.c:931 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:977 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "Skriver stycken till multi-pack-index" -#: midx.c:1056 +#: 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:1112 +#: midx.c:1116 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" + +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1127 +#: 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:1132 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1141 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1150 +#: 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:1170 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1177 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1193 +#: 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:1199 +#: 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:1208 +#: 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:1233 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1243 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1433 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1452 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" @@ -5127,21 +5184,21 @@ msgstr "kunde inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 #, c-format 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:1900 +#: 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:1904 +#: 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?)" @@ -5162,7 +5219,7 @@ msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)" -#: parse-options-cb.c:130 parse-options-cb.c:147 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" @@ -5207,31 +5264,31 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "menade du \"--%s\" (med två bindestreck)?" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "alias för --%s" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -5239,17 +5296,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "-TAL" @@ -5387,7 +5444,7 @@ msgstr "protokollfel: felaktig radlängdstecken: %.4s" msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -5401,15 +5458,24 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:982 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Fjärr utan URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: kunde skriva till underprocessen för fetch" -#: promisor-remote.c:58 +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" +"promisor-remote: kunde inte stänga standard in för underprocessen för fetch" + +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" @@ -5426,7 +5492,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:5143 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -5445,60 +5511,60 @@ 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\"" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte någon utcheckad incheckning" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1330 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1536 +#: read-cache.c:1524 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1651 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5507,7 +5573,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1661 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5516,139 +5582,139 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1717 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1729 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1759 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1761 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1798 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1814 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1871 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1874 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1877 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: 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: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" msgstr "indexfilen trasig" -#: read-cache.c:2124 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2137 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2170 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2174 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2178 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2182 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2224 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2251 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2283 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2330 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 +#: 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:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3142 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3154 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3179 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3328 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -5721,7 +5787,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Ombasera %s på %s (%d kommando)" msgstr[1] "Ombasera %s på %s (%d kommandon)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5730,7 +5796,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5738,7 +5804,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5752,7 +5818,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5762,14 +5828,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:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: 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:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: 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\"." @@ -5803,14 +5869,14 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: 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\"." -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "försvunnen" @@ -5829,238 +5895,233 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:165 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:250 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:272 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "okänt %%(objectsize)-argument: %s" -#: ref-filter.c:280 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:292 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:301 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) tar inte argument" +msgid "unrecognized %%(subject) argument: %s" +msgstr "okänt %%(subject)-argument: %s" -#: ref-filter.c:323 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:352 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:369 +#: ref-filter.c:380 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "positivt värde förväntat \"%s\" i %%(%s)" + +#: ref-filter.c:384 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "positivt värde förväntat objectname:short=%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "okänt argument \"%s\" i %%(%s)" -#: ref-filter.c:373 +#: ref-filter.c:398 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "okänt %%(objectname)-argument: %s" +msgid "unrecognized email option: %s" +msgstr "okänd e-postalternativ: %s" -#: ref-filter.c:403 +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:415 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:422 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:431 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:439 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:559 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:714 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:777 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:779 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:811 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:813 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:828 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:885 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1486 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1489 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ingen gren, ombaserar frånkopplat HEAD %s" -#: ref-filter.c:1492 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "ingen gren, \"bisect\" startad på %s" -#: ref-filter.c:1502 +#: ref-filter.c:1565 msgid "no branch" msgstr "ingen gren" -#: ref-filter.c:1538 ref-filter.c:1747 +#: 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:1548 +#: 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:2001 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2090 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2156 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2395 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "flaggan \"%s\" är inkompatibel med --merged" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "flaggan \"%s\" är inkompatibel med --no-merged" - -#: ref-filter.c:2508 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2513 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -6070,172 +6131,159 @@ 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:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"Använder \"%s\" som namn för den inledande grenen. Detta förvalda grennamn\n" +"kan ändras i framtiden. För att välja vilket namn som ska användas på\n" +"den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n" +"\n" +"\tgit config --global init.defaultBranch <namn>\n" +"\n" +"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n" +"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n" +"\n" +"\tgit branch -m <namn>\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "kunde inte hämta \"%s\"" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "felaktigt namn på gren: %s = %s" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "kunde inte öppna \"%s\" för skrivning: %s" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "Kunde inte läsa referensen \"%s\"" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "referensen \"%s\" finns redan" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "oväntat objekt-id vid skrivning \"%s\"" - -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 -#, c-format -msgid "could not write to '%s'" -msgstr "kunde inte skriva till \"%s\"" - -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 -#, c-format -msgid "could not open '%s' for writing" -msgstr "kunde inte öppna \"%s\" för skrivning" - -#: refs.c:855 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "oväntat objekt-id vid borttagning \"%s\"" - -#: refs.c:986 +#: refs.c:911 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:992 +#: refs.c:917 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:1051 +#: refs.c:976 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1143 +#: refs.c:1068 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1219 +#: refs.c:1139 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:2011 +#: refs.c:1963 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2098 +#: refs.c:2043 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2109 +#: refs.c:2054 msgid "ref updates aborted by hook" msgstr "referensuppdateringar avbrutna av krok" -#: refs.c:2209 refs.c:2239 +#: refs.c:2154 refs.c:2184 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2215 refs.c:2250 +#: refs.c:2160 refs.c:2195 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refspec.c:137 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "mer än en receivepack angavs, använder den första" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:986 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:991 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -6244,7 +6292,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1006 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6267,7 +6315,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1026 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6278,7 +6326,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1031 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6289,7 +6337,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1036 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6300,7 +6348,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1041 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6311,114 +6359,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1077 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1088 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1100 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1107 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa" -#: remote.c:1610 remote.c:1711 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1619 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1622 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1628 +#: 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:1643 +#: 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:1655 +#: 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:1665 +#: 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:1678 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1700 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1826 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1839 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2002 +#: 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:2006 +#: 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:2009 +#: 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:2013 +#: 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:2016 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2020 +#: 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:2026 +#: 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:2029 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6428,11 +6476,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2037 +#: 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:2040 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6447,11 +6495,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2050 +#: 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:2241 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -6471,11 +6519,6 @@ msgstr "duplicerat ersättningsreferensnamn: %s" msgid "replace depth too high for object %s" msgstr "ersättningsdjupet för högt för objektet %s" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "Hashningsalgoritmen %s stöds inte i detta bygge." - #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "trasig MERGE_RR" @@ -6534,8 +6577,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: 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'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -6573,38 +6616,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:3318 +#: 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:2661 +#: revision.c:2336 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<paketfil> stöds inte längre" + +#: revision.c:2356 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "okänt värde för --diff-merges: %s" + +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2664 +#: 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:2873 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent är inkompatibelt med --bisect" - -#: revision.c:2877 +#: 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:1269 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1333 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6613,33 +6661,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:308 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:394 +#: 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:403 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:405 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6647,47 +6695,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:417 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:422 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:192 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:297 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 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:326 +#: sequencer.c:353 msgid "revert" msgstr "revert" -#: sequencer.c:328 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:330 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:332 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:390 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6695,7 +6743,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:393 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6705,43 +6753,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:406 sequencer.c:2921 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:413 +#: 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:441 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: 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:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 -#, c-format -msgid "could not read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: sequencer.c:457 +#: 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:461 +#: 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:493 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -6749,65 +6797,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:643 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:657 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:737 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:748 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: 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:795 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:800 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:805 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:809 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:814 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:816 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:818 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:867 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6836,11 +6884,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1141 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1147 +#: 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" @@ -6867,7 +6915,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1160 +#: 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" @@ -6892,331 +6940,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1204 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1250 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1252 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1256 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1277 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1279 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: 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:1335 sequencer.c:1980 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: 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:1379 sequencer.c:1450 +#: 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:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1476 sequencer.c:1508 +#, c-format +msgid "invalid author identity '%s'" +msgstr "ogiltig författar-identitet \"%s\"" + +#: sequencer.c:1482 +msgid "corrupt author: missing date information" +msgstr "trasig författare: saknar datuminformation" + +#: 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:1433 sequencer.c:4118 +#: 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:1481 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1486 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1627 sequencer.c:1652 +#: 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:1637 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1641 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1647 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: 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:1662 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1669 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1675 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1763 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1770 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1789 +#: 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:1797 sequencer.c:1805 +#: 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:1811 +#: 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:1830 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1895 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1952 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1953 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1972 +#: 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:2030 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2037 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2114 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2123 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2154 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2215 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2226 +#: 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:2310 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2317 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2361 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2363 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2368 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2379 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2381 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2459 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2556 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2576 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2680 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2682 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2685 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2687 +#: 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:2701 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2716 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2776 sequencer.c:4206 +#: 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:2778 sequencer.c:2789 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2780 sequencer.c:2824 +#: 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:2810 builtin/grep.c:744 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2812 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2813 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2819 +#: 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:2830 +#: 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:2871 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2879 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2889 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:2896 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:2899 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" @@ -7225,16 +7282,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3077 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3085 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7253,27 +7310,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3095 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3102 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3116 sequencer.c:3120 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:3132 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3147 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7288,11 +7345,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3153 +#: 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:3159 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7309,90 +7366,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3220 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3274 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3279 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3363 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3394 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3416 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3425 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3437 +#: 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:3453 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3613 +#: 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:3629 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3703 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:3706 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:3712 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:3715 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:3719 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:3744 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3756 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3759 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -7403,34 +7460,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:3764 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:3765 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:3857 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s: inte ett giltigt OID" - -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3877 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3879 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3887 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7451,58 +7503,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3931 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:3976 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4047 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4106 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4111 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4125 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4185 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4218 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4227 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4229 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4231 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4234 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7512,50 +7564,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:4270 sequencer.c:4309 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4324 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4331 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4446 +#: 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:4450 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4485 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4962 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4965 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5242 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5336 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -7610,84 +7662,88 @@ msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1176 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7697,7 +7753,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7706,269 +7762,269 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1360 +#: setup.c:1429 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:2454 +#: 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:2458 +#: 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:1640 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1644 +#: 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:1648 +#: 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:1652 +#: 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:1757 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1764 +#: 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:1771 +#: sha1-file.c:1782 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1791 +#: 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:1856 +#: 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:1858 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1882 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1888 +#: 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:1892 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1896 +#: 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:1906 builtin/pack-objects.c:1085 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1983 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:2022 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:2030 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2130 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2133 +#: 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:2206 sha1-file.c:2216 +#: 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:2222 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2246 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2248 +#: 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:2275 builtin/index-pack.c:155 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2465 sha1-file.c:2518 +#: 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:2489 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2494 +#: 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:2500 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2511 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" @@ -8014,12 +8070,12 @@ msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" msgid "log for '%.*s' only has %d entries" msgstr "loggen för \"%.*s\" har bara %d poster" -#: sha1-name.c:1689 +#: sha1-name.c:1702 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" -#: sha1-name.c:1695 +#: sha1-name.c:1708 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -8028,12 +8084,12 @@ msgstr "" "sökvägen \"%s\" finns, men inte i \"%s\"\n" "tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" -#: sha1-name.c:1704 +#: sha1-name.c:1717 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" -#: sha1-name.c:1732 +#: sha1-name.c:1745 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -8042,7 +8098,7 @@ msgstr "" "sökvägen \"%s\" finns i indexet men inte i etapp %d\n" "tips: Menade du \":%d:%s\"?" -#: sha1-name.c:1748 +#: sha1-name.c:1761 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -8051,21 +8107,21 @@ msgstr "" "sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" "tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" -#: sha1-name.c:1756 +#: sha1-name.c:1769 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" -#: sha1-name.c:1758 +#: sha1-name.c:1771 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" -#: sha1-name.c:1771 +#: sha1-name.c:1784 msgid "relative path syntax can't be used outside working tree" msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" -#: sha1-name.c:1909 +#: sha1-name.c:1922 #, c-format msgid "invalid object name '%.*s'." msgstr "felaktigt objektnamn \"%.*s\"." @@ -8122,6 +8178,12 @@ 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:719 +#: builtin/rebase.c:864 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -8186,7 +8248,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:815 +#: submodule.c:816 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8195,12 +8257,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:910 +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:995 +#: submodule.c:1004 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8209,36 +8271,36 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1118 +#: submodule.c:1127 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1158 +#: submodule.c:1167 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1161 +#: submodule.c:1170 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1453 +#: submodule.c:1462 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1483 +#: submodule.c:1492 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1637 +#: submodule.c:1646 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8247,61 +8309,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1662 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1679 +#: submodule.c:1688 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" -#: submodule.c:1720 +#: submodule.c:1729 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1800 +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1813 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1828 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1855 submodule.c:2165 +#: submodule.c:1859 submodule.c:2169 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1876 +#: submodule.c:1880 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1918 +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1970 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2038 +#: submodule.c:2042 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2059 +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8309,17 +8371,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2075 +#: submodule.c:2079 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2082 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8330,65 +8392,65 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2210 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2250 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: trailer.c:238 +#: 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:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:539 trailer.c:544 builtin/remote.c: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" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "kunde inte öppna temporär fil" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -8439,7 +8501,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:1156 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8457,7 +8519,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:1347 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8466,59 +8528,68 @@ msgstr "funktionen stöds inte av protokollet" msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +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:793 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:854 +#: 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:857 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:860 +#: 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:865 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:871 +#: 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:970 +#: 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:975 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1022 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1052 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8527,52 +8598,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1133 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1142 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1294 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1321 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1370 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1374 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1393 transport-helper.c:1397 +#: 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:1434 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1438 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1456 transport-helper.c:1465 +#: 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" @@ -8591,37 +8662,37 @@ msgstr "kunde inte läsa paketet (bundlen) \"%s\"" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:272 +#: transport.c:269 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:631 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:704 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:838 +#: 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:904 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:957 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1059 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8630,7 +8701,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1063 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8657,11 +8728,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1071 +#: transport.c:1169 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1216 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -8940,7 +9011,7 @@ msgstr "" msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: upload-pack.c:1415 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -8977,47 +9048,83 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:295 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:306 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:318 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:324 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:333 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:587 +msgid "not a directory" +msgstr "inte en katalog" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git är inte en fil" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git-filen är trasig" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git-filen är felaktig" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "inte en giltig sökväg" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "hittar inte arkivet; .git är inte en fil" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "hittar inte arkivet; .git-filen är trasig" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "gitdir är oläsbar" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "gitdir är felaktig" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -9052,11 +9159,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9087,94 +9194,94 @@ msgstr "" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:904 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:936 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1020 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9182,7 +9289,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1112 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -9193,107 +9300,107 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1142 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1145 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1151 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1154 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1163 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1166 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1170 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1307 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1312 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1323 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1328 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1331 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1339 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1351 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1356 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1369 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1380 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1384 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9301,147 +9408,147 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1389 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1392 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1396 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1401 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1404 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1406 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1417 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1420 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1427 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1430 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1433 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1476 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1480 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1483 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1494 +#: wt-status.c:1492 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1733 +#: wt-status.c:1731 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1740 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1742 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1752 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1769 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1770 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1784 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1786 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1790 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9453,27 +9560,27 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1796 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1798 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1804 +#: wt-status.c:1802 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1809 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1812 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" @@ -9487,67 +9594,67 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1818 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1821 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1824 wt-status.c:1829 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1827 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1831 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1944 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1948 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1979 +#: wt-status.c:1975 msgid "different" msgstr "olika" -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "efter " -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2515 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2517 +#: wt-status.c:2513 #, c-format 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\"" @@ -9574,108 +9681,108 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:266 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" -#: builtin/add.c:277 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:281 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:284 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:287 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:289 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:294 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:302 +#: builtin/add.c:308 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:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: 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:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:325 +#: builtin/add.c:331 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:326 builtin/checkout.c:1533 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" -#: builtin/add.c:327 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:328 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:329 +#: builtin/add.c:335 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:331 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:332 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:335 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:338 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:339 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:343 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:345 +#: builtin/add.c:351 msgid "backend for `git stash -p`" msgstr "bakända för \"git stash -p\"" -#: builtin/add.c:363 +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9706,12 +9813,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:391 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:410 +#: builtin/add.c:416 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9721,47 +9828,47 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:419 +#: builtin/add.c:425 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:453 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" -#: builtin/add.c:464 +#: builtin/add.c:470 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file är inkompatibelt med --edit" -#: builtin/add.c:476 +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:479 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: 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:508 builtin/checkout.c:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: 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" -#: builtin/add.c:512 +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:514 +#: builtin/add.c:520 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9819,7 +9926,7 @@ msgstr "ogiltig tidszons-offset" msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:953 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\"" @@ -9894,12 +10001,12 @@ msgstr "Misslyckades slå ihop ändringarna." msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1621 builtin/am.c:1625 +#: 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:1643 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -9907,41 +10014,41 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: 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:1699 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:1703 +#: 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:1743 builtin/am.c:1811 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1760 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1766 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1770 +#: 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:1814 +#: 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" @@ -9951,7 +10058,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:1821 +#: 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 " @@ -9963,17 +10070,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 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:1980 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2024 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9981,155 +10088,155 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2131 +#: 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:2171 +#: 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:2175 +#: 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:2206 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2207 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2213 +#: builtin/am.c:2220 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2215 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2217 +#: 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:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2220 -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:2223 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2225 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2229 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2231 +#: 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:2234 +#: 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:2237 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: 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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: 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:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2269 builtin/branch.c:661 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:2263 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2271 +#: 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:2274 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2277 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2280 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2283 +#: 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:2287 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2292 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2294 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 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:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2300 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2318 +#: 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." @@ -10137,16 +10244,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:2325 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2340 +#: 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:2364 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10155,11 +10262,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2370 +#: 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:2380 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10197,23 +10304,11 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - #: builtin/bisect--helper.c:23 -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:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -10221,7 +10316,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:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -10229,12 +10324,12 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> " "<term-för-fel>" -#: builtin/bisect--helper.c:28 +#: 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:29 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10242,48 +10337,72 @@ msgstr "" "git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<fel> [<rätt>...]] [--] [<sökvägar>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] " +"[<sökvägar>...]" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: 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: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:115 +#, c-format +msgid "could not write to file '%s'" +msgstr "kunde inte skriva till filen \"%s\"" -#: builtin/bisect--helper.c:86 +#: 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:90 +#: 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:100 +#: 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:111 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "termerna måste vara olika" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "kunde inte öppna filen BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: 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:163 +#: 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:172 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10291,27 +10410,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:221 +#: 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:233 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:259 +#: 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:286 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10320,7 +10439,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:290 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10331,7 +10450,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:310 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -10340,15 +10459,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:318 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10357,7 +10476,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:392 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10366,268 +10485,297 @@ 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:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:498 +msgid "revision walk setup failed\n" +msgstr "misslyckades starta revisionstraversering\n" + +#: 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:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "\"\" är inte en giltig term" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:487 +#: 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:519 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:534 +#: 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:555 +#: 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:558 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:638 -msgid "perform 'git bisect next'" -msgstr "utför 'git bisect next'" +#: 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" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: 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:640 -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:642 -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:644 -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:646 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:648 +#: 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:650 +#: 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:652 +#: 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:654 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:658 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" +#: builtin/bisect--helper.c:936 +msgid "find the next bisection commit" +msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:660 -msgid "no log for BISECT_WRITE" -msgstr "ingen logg för BISECT_WRITE" +#: 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:678 -msgid "--write-terms requires two arguments" -msgstr "--write-terms kräver två argument" +#: 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:682 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state tar inga argument" +#: builtin/bisect--helper.c:942 +msgid "no log for BISECT_WRITE" +msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:689 +#: 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:693 +#: 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:699 +#: 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:705 +#: 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:711 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:988 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next kräver 0 argument" + +#: builtin/bisect--helper.c:994 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next kräver 0 argument" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:844 +#: 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:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" +#: 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:846 +#: 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:847 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:848 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:849 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:850 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:852 +#: 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:853 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:854 +#: 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:855 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:856 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:857 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:858 +#: 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:859 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "ignorera <rev> vid klandren" -#: builtin/blame.c:861 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "ignorera revisioner från <fil>" -#: builtin/blame.c:862 +#: 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:863 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:864 +#: 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:865 +#: 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:866 +#: 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:867 builtin/blame.c:868 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "poäng" -#: builtin/blame.c:867 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:868 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "intervall" -#: builtin/blame.c:869 -msgid "Process only line range n,m, counting from 1" -msgstr "Behandla endast radintervallet n,m, med början på 1" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" +msgstr "" +"Behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" -#: builtin/blame.c:921 +#: 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" @@ -10639,24 +10787,24 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1087 +#: 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:1133 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Klandra rader" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -10798,38 +10946,38 @@ msgstr "" msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:542 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:544 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:548 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:551 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:557 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:566 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:568 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:584 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10840,211 +10988,211 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:620 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:620 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:621 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:622 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:626 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:626 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:627 +#: builtin/branch.c:629 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:628 +#: builtin/branch.c:630 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:641 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:642 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:643 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:644 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:645 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:646 +#: builtin/branch.c:648 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:647 +#: builtin/branch.c:649 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:650 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 #: builtin/tag.c:434 msgid "object" msgstr "objekt" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 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:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:751 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:756 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:763 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:766 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:781 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:790 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:795 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:799 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:806 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:819 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:823 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:829 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:839 +#: builtin/branch.c:841 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11052,7 +11200,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:843 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11060,6 +11208,103 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to istället." +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git version:\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() misslyckades med felet \"%s\" (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "kompilatorinfo:" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc-info:" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Tack för att du skriver en buggraport för Git!\n" +"Om du svarar på följande frågor är det lättare för oss att första " +"problemet.\n" +"Skriv gärna på engelska\n" +"\n" +"Vad gjorde du innan felet uppstod? (Steg för att återskapa problemet)\n" +"\n" +"Vad förväntade du skulle hända? (Förväntat beteende)\n" +"\n" +"Vad hände istället? (Faktiskt beteende)\n" +"\n" +"Vad är skillnaden mellan det du förväntade dig och vad som faktiskt hände?\n" +"\n" +"Något mer du vill lägga till:\n" +"\n" +"Se över resten av felrapporten nedan.\n" +"Du kan ta bort rader du inte vill dela.\n" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "ange mål för buggrapporteringsfilen" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "ange ett filändelse i strftime-format" + +#: 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:166 +msgid "System Info" +msgstr "Systeminfo" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "Aktiverade krokar" + +#: 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:179 +#, c-format +msgid "unable to write to %s" +msgstr "kunde inte skriva till %s" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Skapade ny rapport på \"%s\"\n" + #: builtin/bundle.c:15 builtin/bundle.c:23 msgid "git bundle create [<options>] <file> <git-rev-list args>" msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>" @@ -11076,44 +11321,48 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:73 builtin/pack-objects.c:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/bundle.c:93 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "ange formatversion för paket (bundle)." + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "visa inte paketdetaljer" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: 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:190 builtin/remote.c:1717 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -11166,7 +11415,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" @@ -11227,7 +11476,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:1486 builtin/gc.c:537 +#: 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" @@ -11281,54 +11530,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/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:754 +#: 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: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" @@ -11363,83 +11612,83 @@ msgstr "sökvägen \"%s\" har inte deras version" msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:400 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:407 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: 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:702 +#: 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:756 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11448,50 +11697,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:859 +#: 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:901 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:905 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:909 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:912 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:916 +#: 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:918 builtin/checkout.c:1342 +#: 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:920 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11514,7 +11763,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:996 +#: 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" @@ -11541,19 +11790,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: 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:1150 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11562,7 +11811,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:1157 +#: 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" @@ -11582,51 +11831,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:1167 +#: 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:1233 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1250 +#: 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:1296 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:1309 builtin/checkout.c:1675 +#: 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:1356 +#: 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:1358 +#: 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:1359 builtin/checkout.c:1367 +#: 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:1362 +#: 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:1378 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11634,7 +11883,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11642,7 +11891,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:1386 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11650,7 +11899,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11658,7 +11907,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:1394 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11666,146 +11915,146 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1398 +#: 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:1405 +#: 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:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: 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:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: 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:1433 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1441 +#: 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:1448 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 +#: 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:1491 +#: 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:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "stil" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1505 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:1506 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1515 +#: 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:1528 +#: 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:1531 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1535 +#: 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:1590 +#: 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:1594 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1691 +#: 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:1695 +#: 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:1704 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: 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:1718 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11813,70 +12062,70 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1723 +#: 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:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: 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:1750 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1755 +#: 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:1756 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1803 +#: 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:1805 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -11917,7 +12166,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" @@ -11930,7 +12179,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" @@ -11951,8 +12200,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" @@ -12022,7 +12271,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:909 builtin/log.c:182 builtin/log.c:184 +#: 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" @@ -12064,164 +12313,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:554 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 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:551 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:113 builtin/init-db.c:553 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:1407 -#: builtin/submodule--helper.c:1912 +#: 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:1409 -#: builtin/submodule--helper.c:1914 +#: 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:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: 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:169 builtin/grep.c:848 +#: 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:171 builtin/pack-objects.c:3503 +#: 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:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: 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:174 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:1419 -#: builtin/submodule--helper.c:1928 +#: 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:560 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:139 builtin/init-db.c:562 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:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: 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:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: 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:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: 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:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: 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" @@ -12229,42 +12478,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" @@ -12274,137 +12523,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:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:975 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:988 +#: 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:991 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:1007 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: 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:1021 +#: 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:1033 +#: 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:1059 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 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:1053 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1073 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1075 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1099 +#: 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:1164 +#: 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:1166 +#: 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:1168 +#: 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:1170 +#: 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:1173 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1178 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1273 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12440,103 +12699,107 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" "git commit-graph write [--object-dir <objkat>] [--append] [--" "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <delnings-flaggor>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "kunde inte hitta objektkatalog för %s" -#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen ska lagras" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "okänt argument för --split, %s" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "oväntat icke-hexadecimalt objekt-ID: %s" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "ogiltigt objekt: %s" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "aktivera beräkning av ändrade sökvägar" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" -#: builtin/commit-graph.c:197 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" -#: builtin/commit-graph.c:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "låt tid endast gå ut för filer äldre än givet datum och tid" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna" + +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "Hämtar incheckningar från indata" @@ -12553,7 +12816,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:547 +#: 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" @@ -12581,13 +12844,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: 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" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "incheckningsmeddelande" @@ -12595,7 +12858,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:1518 builtin/merge.c:290 +#: 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" @@ -12744,12 +13007,12 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: 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" @@ -12775,37 +13038,35 @@ msgstr "kunde inte läsa MERGE_MSG" msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "Det verkar som du checkar in en sammanslagning.\n" -"Om det inte stämmer tar du bort filen\n" -"\t%s\n" +"Om det inte stämmer kör du\n" +"\tgit update-ref -d MERGE_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "Det verkar som du checkar in en cherry-pick.\n" -"Om det inte stämmer tar du bort filen\n" -"\t%s\n" +"Om det inte stämmer kör du\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12815,7 +13076,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12826,144 +13087,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1057 +#: builtin/commit.c:1055 #, 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:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1173 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1185 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1187 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Du är i mitten av en ombasering -- kan inte utöka." -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1204 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1213 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "version" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: 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" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "läge" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12971,11 +13232,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "när" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12983,172 +13244,172 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" -#: builtin/commit.c:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1503 builtin/merge.c:277 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" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "författare" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "datum" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1511 +#: builtin/commit.c:1509 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:1512 builtin/log.c:1655 builtin/merge.c:293 +#: 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:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1664 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13163,211 +13424,219 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: 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:116 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "endast en typ åt gången" -#: builtin/config.c:125 +#: builtin/config.c:130 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:126 +#: builtin/config.c:131 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:127 +#: builtin/config.c:132 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:128 +#: builtin/config.c:133 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:129 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "använd arbetskatalogens konfigurationsfil" -#: builtin/config.c:130 +#: builtin/config.c:135 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:132 +#: builtin/config.c:137 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "hämta värde: namn [värde-reguttr]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" +msgstr "hämta värde: namn [värde-mönster]" -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "hämta alla värden: nyckel [värde-reguttr]" +#: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "hämta alla värden: nyckel [värde-mönster]" -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" +#: builtin/config.c:140 +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:136 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" -msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" +#: builtin/config.c:142 +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:138 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "ta bort en variabel: namn [värde-reguttr]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "ta bort en variabel: namn [värde-mönster]" -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "ta bort alla träffar: namn [värde-reguttr]" +#: 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:141 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:142 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:143 +#: builtin/config.c:148 msgid "list all" msgstr "visa alla" -#: builtin/config.c:144 +#: 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:145 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:146 +#: 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:147 +#: builtin/config.c:153 msgid "Type" msgstr "Typ" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: 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:149 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:151 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:152 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "värdet är --bool eller sträng" + +#: 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:153 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:154 +#: builtin/config.c:161 msgid "Other" msgstr "Andra" -#: builtin/config.c:155 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:156 +#: builtin/config.c:163 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:157 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:158 +#: 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:159 +#: 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:160 builtin/env--helper.c:40 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "värde" -#: builtin/config.c:160 +#: 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:174 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "fel antal argument, skulle vara %d" -#: builtin/config.c:176 +#: 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:324 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmönster: %s" -#: builtin/config.c:360 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvärde: %s" -#: builtin/config.c:417 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "kan inte tolka färgen \"%s\"" -#: builtin/config.c:459 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "inte i en git-katalog" -#: builtin/config.c:515 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "skriva till standard in stöds inte" -#: builtin/config.c:518 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "skriva konfigurations-blobbar stöds inte" -#: builtin/config.c:603 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13382,23 +13651,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "endast en konfigurationsfil åt gången" -#: builtin/config.c:632 +#: 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:635 +#: 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:655 +#: 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:684 msgid "$HOME not set" msgstr "$HOME inte satt" -#: builtin/config.c:679 +#: 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" @@ -13408,52 +13681,56 @@ msgstr "" "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer" -#: builtin/config.c:714 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color och variabeltyp stämmer inte överens" -#: builtin/config.c:719 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "endast en åtgärd åt gången" -#: builtin/config.c:732 +#: 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:738 +#: 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:744 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default gäller bara för --get" -#: builtin/config.c:757 +#: 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:760 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "fel vid hantering av konfigurationsfil(er)" -#: builtin/config.c:770 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "redigering av standard in stöds ej" -#: builtin/config.c:772 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "redigering av blobbar stöds ej" -#: builtin/config.c:786 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:799 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13462,7 +13739,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:873 builtin/config.c:884 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "ingen sådan sektion: %s" @@ -13475,6 +13752,37 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"Behörigheten på din uttags-katalog (socket) är för lös; andra\n" +"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "skriv felsökningsmeddelanden på standard fel" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" +"\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas" + +#: builtin/credential-cache.c:154 +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>...]" @@ -13640,41 +13948,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:242 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" -#: builtin/diff.c:469 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:514 +#: 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:525 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:530 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/diff.c:564 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" @@ -13704,7 +14020,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')." @@ -13712,53 +14028,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" @@ -13766,31 +14082,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>" @@ -13798,26 +14114,26 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "typ" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "standard för git_env_*(...) att falla tillbaka på" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "var tyst, använd bara git_env_*() som resultatvärde" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" "flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte " "\"%s\"" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13834,95 +14150,124 @@ msgstr "git fast-export [rev-list-flaggor]" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "symbolen för --anonymize-map kan inte vara tom" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "Dumpa märken till filen" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "Import marks from this file if it exists" msgstr "Importera märken från filen, om den finns" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "från:till" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "konvertera <från> till <till> i anonymiserad utdata" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 msgid "Reference parents which are not in fast-export stream by object id" msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1231 msgid "Show original object ids of blobs/commits" msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "Label tags with mark ids" msgstr "Märk taggar med märke-id" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "--anonymize-map utan --anonymize ger ingen mening" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "Kan inte ange både --import-marks och --import-marks-if-exists" -#: builtin/fetch-pack.c:245 +#: 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:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Saknar till-märken för undermodulen \"%s\"" + +#: 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:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Förväntade \"to\"-kommando, fick %s" + +#: 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:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" + +#: builtin/fetch-pack.c:241 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Låsfil skapad men inte rapporterad: %s" @@ -13943,89 +14288,93 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:117 +#: builtin/fetch.c:119 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:144 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:155 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:161 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "skriv hämtade referenser till FETCH_HEAD-filen" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:167 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:181 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:184 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14033,94 +14382,98 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" -msgstr "kör \"gc --auto\" efter hämtning" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:204 +#: builtin/fetch.c:210 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:514 +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "ta emot referenser från standard in" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:654 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:752 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:770 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:780 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:785 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:807 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:810 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:813 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:852 +#: builtin/fetch.c:875 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:857 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:878 +#: builtin/fetch.c:901 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14131,7 +14484,7 @@ msgstr "" "av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "\"git config fetch.showForcedUpdates true\"." -#: builtin/fetch.c:882 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14144,22 +14497,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:935 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14168,56 +14521,56 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1207 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1448 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1463 msgid "not setting upstream for a remote remote-tracking branch" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1465 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1467 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1469 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14225,22 +14578,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1620 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14248,44 +14601,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar ska hämtas från." -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1836 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14293,6 +14646,10 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin kan bara användas för att hämta från en fjärr" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" @@ -14328,8 +14685,9 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objekt>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "" +"git for-each-ref [--merged [<incheckning>]] [--no-merged <incheckning>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -14380,6 +14738,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" @@ -14526,7 +14900,7 @@ msgstr "Kontrollerar objektkataloger" msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" @@ -14613,7 +14987,7 @@ msgstr "visa förlopp" msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -14627,31 +15001,31 @@ msgstr "%s: objekt saknas" msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" -#: builtin/gc.c:35 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:90 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: 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:484 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:491 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14666,52 +15040,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:541 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:542 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:545 +#: 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:548 +#: 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:565 +#: 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:576 +#: 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:596 +#: 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:598 +#: 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:599 +#: 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:639 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14719,13 +15093,149 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:694 +#: 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: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:862 +msgid "failed to write commit-graph" +msgstr "kunde inte skriva incheckningsgraf" + +#: 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:1309 +#, c-format +msgid "task '%s' failed" +msgstr "uppgiften \"%s\" misslyckades" + +#: builtin/gc.c:1389 +#, c-format +msgid "'%s' is not a valid task" +msgstr "\"%s\" är inte en giltig uppgift" + +#: 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:1409 +msgid "run tasks based on the state of the repository" +msgstr "kör uppgifter baserad på arkivets tillstånd" + +#: 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:1415 +msgid "task" +msgstr "uppgift" + +#: builtin/gc.c:1416 +msgid "run a specific task" +msgstr "utför en specifik uppgift" + +#: 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: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" + #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" @@ -14744,8 +15254,8 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" @@ -14760,242 +15270,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:724 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:823 +#: 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:825 +#: 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:827 +#: 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:829 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:831 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:834 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:836 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:838 +#: 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:840 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:842 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:845 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:847 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:849 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:853 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:856 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:859 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:862 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:865 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:866 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:867 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:868 +#: builtin/grep.c:880 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:870 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:872 +#: 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:874 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:877 +#: 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:879 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:882 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:884 +#: 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:885 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:887 +#: 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:889 +#: 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:892 +#: 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:895 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:897 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:899 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:900 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:903 +#: 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:905 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:908 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:910 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:912 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:924 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:926 +#: 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:928 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:936 +#: 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:1003 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1039 +#: 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:1047 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1077 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1081 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: 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:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: 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:1121 +#: 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:1147 +#: 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:1153 +#: 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:1161 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -15132,7 +15642,7 @@ msgstr "ingen info-visare hanterade förfrågan" msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" @@ -15146,353 +15656,353 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1642 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1649 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1825 msgid "--object-format cannot be used with --stdin" msgstr "--object-format kan inte användas med --stdin" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:276 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "ogiltigt namn på första gren: \"%s\"" -#: builtin/init-db.c:368 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:371 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -15506,32 +16016,32 @@ msgstr "försöker initiera arkivet på nytt med annan hash" msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:444 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorerade --initial-branch=%s" -#: builtin/init-db.c:475 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:476 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:530 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15539,37 +16049,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:556 +#: builtin/init-db.c:557 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:557 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet ska delas bland flera användare" -#: builtin/init-db.c:563 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "överstyr namnet på första gren" -#: builtin/init-db.c:564 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "ange hashningsalgoritm att använda" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:607 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:634 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15578,11 +16092,15 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:662 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separatebgit-dir är inkompatibelt med naket arkiv" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -15647,126 +16165,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:57 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:111 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:184 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:188 -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:298 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:556 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:571 builtin/log.c:666 +#: 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:691 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:835 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:842 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:957 -msgid "name of output directory is too long" -msgstr "namnet på utdatakatalogen är för långt" - -#: builtin/log.c:973 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:990 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1000 +#: builtin/log.c:1011 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1164 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1170 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1249 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1276 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1334 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: 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:1455 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:1460 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1464 +#: 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" @@ -15776,275 +16298,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:1484 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1495 +#: 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:1499 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1552 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" -msgstr "misslyckades räkna ut intervall range-diff" +#: 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: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:1650 +#: 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:1653 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1657 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1659 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1661 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1662 +#: builtin/log.c:1751 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1663 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1665 +#: 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:1667 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1669 +#: 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:1672 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1673 +#: 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:1675 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1678 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1681 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1684 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1686 +#: 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:1688 +#: 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:1690 +#: 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:1692 +#: builtin/log.c:1783 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1693 +#: builtin/log.c:1784 msgid "header" msgstr "huvud" -#: builtin/log.c:1694 +#: builtin/log.c:1785 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "epost" -#: builtin/log.c:1695 +#: builtin/log.c:1786 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1696 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1697 +#: builtin/log.c:1788 msgid "ident" msgstr "ident" -#: builtin/log.c:1698 +#: 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:1700 +#: builtin/log.c:1791 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1701 +#: 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:1702 builtin/log.c:1705 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1703 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1706 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1710 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1712 +#: builtin/log.c:1803 msgid "signature" msgstr "signatur" -#: builtin/log.c:1713 +#: builtin/log.c:1804 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1714 +#: builtin/log.c:1805 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1715 +#: 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:1717 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1718 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1720 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1722 +#: 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:1725 +#: 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:1727 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1812 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1827 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1829 +#: 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:1837 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1839 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1841 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1874 -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:1978 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1982 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1983 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1989 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1993 +#: 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:2001 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2002 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2013 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2049 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2093 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2152 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2206 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16168,7 +16699,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:1384 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "exec" @@ -16352,192 +16883,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:121 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:190 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:191 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:196 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:253 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:256 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:258 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:260 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:262 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:264 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:268 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:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 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:270 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:271 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:272 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:274 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:281 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:283 +#: 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:285 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:287 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:294 +#: 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:311 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:316 +#: builtin/merge.c:324 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:321 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:390 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:401 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:502 +#: 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:589 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:716 +#: 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:730 +#: 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:745 +#: 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:797 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:806 +#: 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:812 +#: 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" @@ -16548,11 +17079,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:817 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:820 +#: builtin/merge.c:830 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -16561,73 +17092,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:888 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:949 +#: 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:988 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:990 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:992 +#: 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:997 +#: 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:1054 +#: 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:1157 +#: 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:1191 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1295 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1299 +#: 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:1317 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1330 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1334 +#: 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:1350 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16635,7 +17166,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1357 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16643,96 +17174,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:1360 +#: 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:1374 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1376 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1392 +#: 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:1409 +#: 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:1411 +#: 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:1416 +#: 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:1418 +#: 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:1499 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1508 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1518 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1564 +#: 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:1571 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1602 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: 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:1634 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1686 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1688 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1697 +#: 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:1711 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16814,68 +17345,72 @@ msgstr "tvinga flytta/ändra namn även om målet finns" msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "inte versionshanterad" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "i konflikt" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -16893,8 +17428,8 @@ msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "skriv endast namn (ingen SHA-1)" +msgid "print only ref-based names (no object names)" +msgstr "skriv endast referensbaserade namn (inga objektnamn)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17335,119 +17870,119 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:1016 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1774 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1783 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:2054 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2309 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2961 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -17456,14 +17991,14 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2964 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17472,7 +18007,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17481,236 +18016,236 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3460 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3470 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3472 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3487 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3538 +#: builtin/pack-objects.c:3570 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3571 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3573 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som ska överföras" -#: builtin/pack-objects.c:3629 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3634 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3637 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3643 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3703 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3734 +#: builtin/pack-objects.c:3766 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17776,7 +18311,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:478 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -17801,7 +18336,7 @@ msgstr "antal undermoduler som hämtas parallellt" msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:349 +#: builtin/pull.c:348 msgid "" "Pulling without specifying how to reconcile divergent branches is\n" "discouraged. You can squelch this message by running one of the following\n" @@ -17830,7 +18365,7 @@ msgstr "" "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" "förvalet vid körning.\n" -#: builtin/pull.c:459 +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17838,14 +18373,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:461 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:462 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17853,7 +18388,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:465 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17864,42 +18399,41 @@ 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:470 builtin/rebase.c:1234 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:472 builtin/pull.c:487 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:474 builtin/pull.c:489 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." -#: builtin/pull.c:475 builtin/pull.c:490 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 -#: builtin/rebase.c:1240 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 -#: git-parse-remote.sh:65 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:485 builtin/rebase.c:1232 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:494 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:" -#: builtin/pull.c:499 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17908,28 +18442,28 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:610 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:895 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:955 +#: 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:959 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:960 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:985 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17940,7 +18474,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:991 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17957,15 +18491,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:1006 +#: 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:1010 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:1018 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -17973,15 +18507,15 @@ msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:122 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:168 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17990,7 +18524,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:171 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18015,7 +18549,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18030,7 +18564,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:200 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18043,12 +18577,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:211 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18059,14 +18593,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "ska sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:270 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:277 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18078,7 +18612,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:283 +#: builtin/push.c:273 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18090,7 +18624,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:289 +#: builtin/push.c:279 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18104,11 +18638,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:296 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:299 +#: builtin/push.c:289 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18119,99 +18653,115 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:361 +#: 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:368 +#: 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:542 +#: builtin/push.c:553 msgid "repository" msgstr "arkiv" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:546 +#: builtin/push.c:557 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:547 +#: 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:550 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:551 builtin/send-pack.c:179 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:552 builtin/send-pack.c:180 +#: 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:555 +#: 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:556 builtin/send-pack.c:174 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: 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:559 +#: 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:562 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:564 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:567 builtin/send-pack.c:168 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:569 builtin/send-pack.c:175 +#: 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:587 +#: 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:589 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:609 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:610 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18232,27 +18782,27 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:625 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:627 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:631 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:633 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:636 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:640 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -18398,193 +18948,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 +#: 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:298 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:358 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:399 +#: 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:468 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:481 builtin/rebase.c:1374 +#: 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:485 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:487 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:489 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:491 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:492 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:494 builtin/rebase.c:1314 +#: 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:496 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:498 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:499 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:501 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:504 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:506 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:508 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:510 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:512 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:513 +#: builtin/rebase.c:525 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:518 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:519 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:521 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:528 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:529 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:530 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:531 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:532 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:537 builtin/rebase.c:1407 +#: 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:553 +#: 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:569 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:612 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:629 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:654 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:799 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" @@ -18598,7 +19148,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:882 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -18617,7 +19167,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1208 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -18625,7 +19175,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1226 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -18642,7 +19192,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1242 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18655,136 +19205,148 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1272 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1305 +#: 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:1307 +#: 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:1309 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1311 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1317 +#: 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:1320 -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:1336 +msgid "make committer date match author date" +msgstr "sätt incheckningsdatum till författardatum" + +#: builtin/rebase.c:1338 +msgid "ignore author date and use current date" +msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 -msgid "passed to 'git am'" -msgstr "sänds till \"git am\"" +#: builtin/rebase.c:1340 +msgid "synonym of --reset-author-date" +msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1330 builtin/rebase.c:1332 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1334 builtin/rebase.c:1337 +#: builtin/rebase.c:1344 +msgid "ignore changes in whitespace" +msgstr "ignorera ändringar i blanksteg" + +#: 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:1339 +#: builtin/rebase.c:1353 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1347 +#: 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:1348 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1351 +#: 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:1354 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1362 +#: 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:1366 +#: 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:1371 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1378 +#: 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:1385 +#: 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:1389 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1393 +#: 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:1396 +#: 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:1398 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1400 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1404 +#: 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:1409 +#: 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:1426 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18792,41 +19354,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:1432 +#: 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:1473 +#: 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:1478 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1491 +#: 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:1514 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18834,16 +19396,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1564 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1610 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18864,134 +19426,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:1638 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1680 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1702 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "kan inte kombinera apply-flaggor med merge-flaggor" -#: builtin/rebase.c:1745 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1790 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1794 +#: 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:1818 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1824 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1850 +#: 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:1853 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1861 +#: 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:1887 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: 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:1906 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:1976 +#: 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:1984 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:1986 +#: 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:1994 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2004 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2029 +#: 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:2038 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -19000,7 +19562,7 @@ msgstr "Snabbspolade %s till %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:844 +#: 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" @@ -19030,7 +19592,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:864 +#: 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" @@ -19051,11 +19613,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1970 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1984 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -19251,40 +19813,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:696 +#: 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:700 -#, 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:653 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "kunde inte ställa in \"%s\"" -#: builtin/remote.c:658 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19295,17 +19852,17 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: 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:706 +#: 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:726 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19316,17 +19873,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:766 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:800 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:876 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19340,118 +19897,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:890 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:993 +#: 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:996 +#: builtin/remote.c:1002 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:998 +#: 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:1000 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: 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:1050 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:1052 +#: 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:1055 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1114 msgid "create" msgstr "skapa" -#: builtin/remote.c:1111 +#: builtin/remote.c:1117 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1115 +#: builtin/remote.c:1121 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1118 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1121 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1233 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(ingen URL)" @@ -19459,176 +20016,176 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: 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:1253 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1259 +#: 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:1271 +#: 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:1274 builtin/remote.c:1300 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1283 +#: 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:1291 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1297 +#: 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:1318 +#: 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:1320 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1337 +#: 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:1347 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: 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:1530 +#: builtin/remote.c:1539 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1537 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1554 +#: 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:1556 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1584 +#: 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:1610 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1612 +#: builtin/remote.c:1623 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1621 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1660 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" @@ -19645,134 +20202,120 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:193 +#: builtin/repack.c:197 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:232 builtin/repack.c:418 +#: 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:256 +#: 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:294 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:296 +#: 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:299 +#: 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:301 +#: 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:303 +#: 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:305 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:312 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:342 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:314 +#: 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:316 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:318 +#: 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:319 builtin/repack.c:325 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "byte" -#: builtin/repack.c:320 +#: 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:322 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:324 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:326 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:328 +#: 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:330 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:340 +#: 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:344 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:427 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:488 +#: 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:536 +#: 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>" @@ -20102,8 +20645,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" @@ -20312,11 +20855,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" @@ -20415,55 +20958,76 @@ msgstr "" "[<ref>...]\n" " --all och explicit angiven <ref> är ömsesidigt uteslutande." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "fjärrnamn" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "använd tillståndslöst RPC-protokoll" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "läs referenser från standard in" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<flaggor>]" -#: builtin/shortlog.c:264 +#: 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: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:335 +#, c-format +msgid "unknown group type: %s" +msgstr "okänd grupptyp: %s" + +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:266 +#: 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:268 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:374 +msgid "field" +msgstr "föt" + +#: builtin/shortlog.c:375 +msgid "Group by field" +msgstr "Gruppera efter fält" + +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" @@ -20659,59 +21223,71 @@ msgstr "visa referenser från standard in som inte finns i lokalt arkiv" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" -#: builtin/sparse-checkout.c:64 +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" -#: builtin/sparse-checkout.c:216 +#: builtin/sparse-checkout.c:228 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:257 +#: builtin/sparse-checkout.c:269 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" -#: builtin/sparse-checkout.c:259 +#: builtin/sparse-checkout.c:271 msgid "failed to set extensions.worktreeConfig setting" msgstr "misslyckades ändra inställningen extensions.worktreeConfig" -#: builtin/sparse-checkout.c:276 +#: builtin/sparse-checkout.c:288 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:307 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:332 +#: builtin/sparse-checkout.c:344 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:389 +#: builtin/sparse-checkout.c:401 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:413 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" -#: builtin/sparse-checkout.c:426 +#: builtin/sparse-checkout.c:438 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:549 +#: builtin/sparse-checkout.c:561 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:586 +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -20814,7 +21390,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 @@ -20834,120 +21410,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:1475 builtin/stash.c:1540 +#: 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:1046 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1146 +#: 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:1173 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1182 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1193 builtin/stash.c:1202 +#: 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:1230 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1279 +#: 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:1295 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1310 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1317 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1332 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1337 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1427 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: 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:1473 builtin/stash.c:1538 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1573 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -20971,7 +21547,7 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -20985,7 +21561,7 @@ msgstr "submodule--helper print-default-remote tar inga argument" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -20993,8 +21569,8 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" @@ -21028,7 +21604,7 @@ msgstr "" msgid "Suppress output of entering each submodule command" msgstr "Dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "Rekursera in i nästlade undermoduler" @@ -21045,54 +21621,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21100,47 +21676,104 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "kunde inte hasha objekt från \"%s\"" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "okänt läge %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"för att jämföra incheckningen i indexet med den som lagrats i undermodulens " +"HEAD" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" +"hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "begränsa översiktsstorleken" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" +"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "kunde inte hämta en version för HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached och --files är ömsesidigt uteslutande" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21149,7 +21782,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21158,46 +21791,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1289 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -21209,46 +21842,46 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -21258,103 +21891,103 @@ msgstr "" "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" "path <sökväg>" -#: builtin/submodule--helper.c:1449 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1464 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "katalogen inte tom: \"%s\"" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1933 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21363,84 +21996,84 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:176 +#: 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" -#: builtin/submodule--helper.c:2257 +#: builtin/submodule--helper.c:2681 msgid "Suppress output for setting url of a submodule" msgstr "Dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2261 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2294 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2296 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2300 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2301 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>" -#: builtin/submodule--helper.c:2308 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:2311 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 +#: 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" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -21466,11 +22099,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" @@ -21490,11 +22123,13 @@ msgstr "git tag -d <taggnamn>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " "<incheckning>] [--points-at <objekt>]\n" -"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" +"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] " +"[<mönster>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -21616,7 +22251,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" @@ -21966,19 +22601,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" @@ -22022,15 +22657,15 @@ msgstr "visa innehåll för incheckning" msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "pratsam" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "visa endast statistik" @@ -22070,7 +22705,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:972 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -22196,7 +22831,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" @@ -22206,54 +22841,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:1000 +#: 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:1002 +#: 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" @@ -22262,7 +22897,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" @@ -22270,38 +22905,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:952 +#: 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:956 +#: 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:961 +#: 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:984 +#: 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:1007 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22310,7 +22945,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:1009 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22318,11 +22953,21 @@ 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:1012 +#: 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:1037 +#, c-format +msgid "repair: %s: %s" +msgstr "reparera: %s: %s" + +#: builtin/worktree.c:1040 +#, c-format +msgid "error: %s: %s" +msgstr "fel: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -22339,161 +22984,30 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: bugreport.c:15 -msgid "git version:\n" -msgstr "git version:\n" - -#: bugreport.c:21 -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() misslyckades med felet \"%s\" (%d)\n" - -#: bugreport.c:31 -msgid "compiler info: " -msgstr "kompilatorinfo:" - -#: bugreport.c:34 -msgid "libc info: " -msgstr "libc-info:" - -#: bugreport.c:80 -msgid "not run from a git repository - no hooks to show\n" -msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" - -#: bugreport.c:90 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]" - -#: bugreport.c:97 -msgid "" -"Thank you for filling out a Git bug report!\n" -"Please answer the following questions to help us understand your issue.\n" -"\n" -"What did you do before the bug happened? (Steps to reproduce your issue)\n" -"\n" -"What did you expect to happen? (Expected behavior)\n" -"\n" -"What happened instead? (Actual behavior)\n" -"\n" -"What's different between what you expected and what actually happened?\n" -"\n" -"Anything else you want to add:\n" -"\n" -"Please review the rest of the bug report below.\n" -"You can delete any lines you don't wish to share.\n" -msgstr "" -"Tack för att du skriver en buggraport för Git!\n" -"Om du svarar på följande frågor är det lättare för oss att första " -"problemet.\n" -"Skriv gärna på engelska\n" -"\n" -"Vad gjorde du innan felet uppstod? (Steg för att återskapa problemet)\n" -"\n" -"Vad förväntade du skulle hända? (Förväntat beteende)\n" -"\n" -"Vad hände istället? (Faktiskt beteende)\n" -"\n" -"Vad är skillnaden mellan det du förväntade dig och vad som faktiskt hände?\n" -"\n" -"Något mer du vill lägga till:\n" -"\n" -"Se över resten av felrapporten nedan.\n" -"Du kan ta bort rader du inte vill dela.\n" - -#: bugreport.c:136 -msgid "specify a destination for the bugreport file" -msgstr "ange mål för buggrapporteringsfilen" - -#: bugreport.c:138 -msgid "specify a strftime format suffix for the filename" -msgstr "ange ett filändelse i strftime-format" - -#: bugreport.c:162 -#, c-format -msgid "could not create leading directories for '%s'" -msgstr "kunde inte skapa inledande kataloger för \"%s\"" - -#: bugreport.c:169 -msgid "System Info" -msgstr "Systeminfo" - -#: bugreport.c:172 -msgid "Enabled Hooks" -msgstr "Aktiverade krokar" - -#: bugreport.c:180 -#, c-format -msgid "couldn't create a new file at '%s'" -msgstr "kunde inte skapa filen på \"%s\"" - -#: bugreport.c:184 -#, c-format -msgid "unable to write to %s" -msgstr "kunde inte skriva till %s" - -#: bugreport.c:194 -#, c-format -msgid "Created new report at '%s'.\n" -msgstr "Skapade ny rapport på \"%s\"\n" - -#: fast-import.c:3100 -#, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Saknar från-märken för undermodulen \"%s\"" - -#: fast-import.c:3102 -#, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Saknar till-märken för undermodulen \"%s\"" - -#: fast-import.c:3237 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Förväntade \"mark\"-kommando, fick %s" - -#: fast-import.c:3242 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Förväntade \"to\"-kommando, fick %s" - -#: fast-import.c:3334 -msgid "Expected format name:filename for submodule rewrite option" -msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan" - -#: fast-import.c:3388 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" - -#: http-fetch.c:111 +#: http-fetch.c:114 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" "argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"Behörigheten på din uttags-katalog (socket) är för lös; andra\n" -"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n" -"\n" -"\tchmod 0700 %s" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "inte ett git-arkiv" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "skriv felsökningsmeddelanden på standard fel" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "flaggor som inte hanterats" -#: t/helper/test-reach.c:152 +#: 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" msgstr "incheckning %s är inte märkt nåbar" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "för många incheckningar markerade nåbara" @@ -22569,12 +23083,12 @@ msgstr "ingen katalog angavs för -C\n" msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:362 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:371 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -22583,39 +23097,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:378 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:381 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:463 +#: git.c:465 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:465 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:467 +#: git.c:469 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:792 +#: 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:842 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:855 +#: git.c:883 #, c-format msgid "" "usage: %s\n" @@ -22624,13 +23138,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:875 +#: 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:887 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -22682,134 +23196,134 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:168 +#: 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:295 +#: 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:396 +#: 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:427 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:487 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:491 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:495 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:501 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:630 +#: 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:642 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "fjärrservern sände tillståndslös avdelare" -#: remote-curl.c:712 +#: 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:742 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: felaktig radlängdstecken: %.4s" -#: remote-curl.c:744 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: oväntat svarsavslutningspaketet" -#: remote-curl.c:820 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:860 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:975 +#: 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:979 +#: 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:1029 +#: 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:1031 +#: 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:1120 +#: 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:1135 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1183 +#: 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:1227 remote-curl.c:1233 +#: 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:1245 remote-curl.c:1360 +#: 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:1281 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1466 +#: 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:1498 +#: 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:1505 +#: 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:1546 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" @@ -22822,11 +23336,11 @@ msgstr "ingen kompilatorinformation tillgänglig\n" msgid "no libc information available\n" msgstr "ingen libc-information tillgänglig\n" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:91 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "objektfiltrering" @@ -22847,8 +23361,8 @@ msgid "be more quiet" msgstr "var mer tyst" #: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "använd <n> siffror för att visa SHA-1:or" +msgid "use <n> digits to display object names" +msgstr "använd <n> siffror för att visa objektnamn" #: parse-options.h:336 msgid "how to strip spaces and #comments from message" @@ -22863,11 +23377,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "key" msgstr "nyckel" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "fältnamn att sortera på" @@ -23081,525 +23595,510 @@ 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:124 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: command-list.h:123 +#: 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:124 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Kör en trevägs-filsammanslagning" -#: command-list.h:125 +#: 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:126 +#: 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:127 +#: 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:128 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Visa trevägssammanslagning utan att röra indexet" -#: command-list.h:129 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Skriv och verifiera multi-pack-index" -#: command-list.h:130 +#: command-list.h:132 msgid "Creates a tag object" msgstr "Skapar ett taggobjekt" -#: command-list.h:131 +#: 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:132 +#: 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:133 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Hitta symboliska namn för givna referenser" -#: command-list.h:134 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Lägg till eller inspektera objektanteckningar" -#: command-list.h:135 +#: 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:136 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Skapa ett packat arkiv med objekt" -#: command-list.h:137 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Hitta redundanta pack-filer" -#: command-list.h:138 +#: 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:139 -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:140 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Beräkna unik ID för en patch" -#: command-list.h:141 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Ta bort alla onåbara objekt från objektdatabasen" -#: command-list.h:142 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Ta bort extraobjekt som redan finns i pack-filerna" -#: command-list.h:143 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: command-list.h:144 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: command-list.h:145 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren" -#: command-list.h:146 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)" -#: command-list.h:147 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Läser trädinformation in i indexet" -#: command-list.h:148 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp" -#: command-list.h:149 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Ta emot det som sänds till arkivet" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Hantera referenslogg-information" -#: command-list.h:151 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Hantera uppsättningen spårade arkiv" -#: command-list.h:152 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Packa opackade objekt i ett arkiv" -#: command-list.h:153 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Skapa, visa, ta bort referenser för att ersätta objekt" -#: command-list.h:154 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Skapar en sammanfattning av väntande ändringar" -#: command-list.h:155 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Återanvänd sparad lösning av sammanslagningskonflikter" -#: command-list.h:156 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: command-list.h:157 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Återställ filer i arbetskatalogen" -#: command-list.h:158 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Återställ några befintliga incheckningar" -#: command-list.h:159 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning" -#: command-list.h:160 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Plocka ut och massera parametrar" -#: command-list.h:161 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: command-list.h:162 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Sänd en uppsättning patchar som e-post" -#: command-list.h:163 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Sänd objekt över Git-protokollet till annat arkiv" -#: command-list.h:164 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git" -#: command-list.h:165 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Summera \"git log\"-utdata" -#: command-list.h:166 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: command-list.h:167 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Visa grenar och deras incheckningar" -#: command-list.h:168 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Skapa packat arkivindex" -#: command-list.h:169 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Visa referenser i ett lokalt arkiv" -#: command-list.h:170 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "Git:s i18n-startkod för skalskript" -#: command-list.h:171 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" -#: command-list.h:172 +#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "Initiera och modifiera sparse-checkout" -#: command-list.h:173 +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:174 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:175 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:176 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:177 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:178 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:179 +#: command-list.h:180 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:180 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:181 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:182 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:183 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:184 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:185 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:186 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:187 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:188 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:189 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:191 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:192 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:193 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:194 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:195 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:196 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:197 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:198 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:199 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:200 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Tillhandahåll användarnamn och lösenord till Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:201 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:202 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" -#: command-list.h:203 +#: command-list.h:205 msgid "Frequently asked questions about using Git" msgstr "Ofta ställda frågor om att använda Git" -#: command-list.h:204 +#: command-list.h:206 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:205 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:206 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:207 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:208 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:209 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "Hjälpprogram för att interagera med fjärrarkiv" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:210 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:211 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "Monterar ett arkiv inuti ett annat" -#: command-list.h:212 +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:213 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:214 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Du måste starta med \"git bisect start\"" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -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]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Felaktig rev-indata: $bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Felaktig rev-indata: $rev" - -#: git-bisect.sh:139 -#, 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:209 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:210 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:233 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:243 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." -#: git-bisect.sh:248 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:255 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" @@ -23608,24 +24107,24 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:281 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:287 +#: 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:294 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:302 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." @@ -23669,46 +24168,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:205 +#: 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:215 +#: 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:234 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:237 +#: 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:244 +#: 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:275 +#: 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:277 +#: 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:285 +#: 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:287 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23726,37 +24225,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:293 +#: 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:305 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:310 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:319 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:592 +#: 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:602 +#: 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:607 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23765,7 +24264,7 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:625 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23774,7 +24273,7 @@ msgstr "" "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " "direkt:" -#: git-submodule.sh:631 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23783,83 +24282,52 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:638 +#: 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:639 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:643 +#: 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:644 +#: 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:649 +#: 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:650 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:655 +#: 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:656 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:687 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:852 -msgid "The --cached option cannot be used with the --files option" -msgstr "Flaggan --cached kan inte användas med flaggan --files" - -#: git-submodule.sh:904 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "oväntat läge $mod_dst" - -#: git-submodule.sh:924 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" - -#: git-submodule.sh:927 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" - -#: git-submodule.sh:930 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Varning: $display_name innehåller inte incheckningarna $sha1_src och " -"$sha1_dst" - -#: 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." @@ -23884,7 +24352,7 @@ msgstr "" msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -23925,7 +24393,7 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -23944,83 +24412,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Kunde inte tillämpa $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -24034,31 +24502,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -24069,7 +24537,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -24084,25 +24552,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -24133,11 +24601,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -24145,44 +24613,44 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--preserve-merges.sh:955 +#: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" @@ -24252,14 +24720,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:1055 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24267,7 +24735,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24275,7 +24743,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24283,8 +24751,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: 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." @@ -24292,8 +24760,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 -#: git-add--interactive.perl:1076 +#: 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." @@ -24301,12 +24769,12 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1113 +#: 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:1120 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24319,12 +24787,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:1142 +#: 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:1250 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24338,7 +24806,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:1256 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24352,7 +24820,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:1262 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24366,7 +24834,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:1268 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24380,7 +24848,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:1274 git-add--interactive.perl:1292 +#: 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" @@ -24394,7 +24862,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:1280 +#: 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" @@ -24408,7 +24876,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:1286 +#: 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" @@ -24422,7 +24890,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:1298 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24436,7 +24904,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:1313 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24458,90 +24926,90 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1344 +#: 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:1359 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1478 +#: 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:1479 +#: 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:1480 +#: 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:1481 +#: 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:1587 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1610 +#: 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:1636 +#: 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:1653 +#: 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:1663 +#: 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:1675 git-add--interactive.perl:1697 +#: 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:1684 git-add--interactive.perl:1703 +#: 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:1709 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1715 +#: 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:1725 +#: 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:1790 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24558,19 +25026,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:1807 git-add--interactive.perl:1812 -#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 -#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 -#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 +#: 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:1838 +#: 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:1844 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -24587,27 +25055,39 @@ msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"ödesdigert: hittade konfigurationsflaggor för \"sendmail\"\n" +"git-send-email konfigureras med \"sendemail.*\"-flaggor - lägg märke till \"e" +"\".\n" +"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna " +"kontroll.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -24615,37 +25095,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24660,12 +25140,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -24674,7 +25154,7 @@ msgstr "" "ödesdigert: %s: %s\n" "varning: inga patchar har sänts\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -24684,17 +25164,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24708,38 +25188,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24752,21 +25232,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem ska breven sändas (om någon)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -24774,16 +25254,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1045 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24810,124 +25290,124 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1460 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1757 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1868 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1875 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1879 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1909 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1917 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1961 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: patchen innehåller en rad längre än 998 tecken" -#: git-send-email.perl:1978 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -24935,11 +25415,202 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1982 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "Counting distinct commits in commit graph" +#~ msgstr "Räknar olika incheckningar i incheckningsgraf" + +#~ msgid "the commit graph format cannot write %d commits" +#~ msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" + +#~ 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" + +#~ msgid "" +#~ "commit-graph chunk lookup table entry missing; file may be incomplete" +#~ msgstr "" +#~ "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " +#~ "ofullständig" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "Skriver Bloom-filterindex för ändrade sökvägar" + +#~ msgid "hash version %u does not match" +#~ msgstr "hash-versionen %u stämmer inte" + +#~ msgid "Remote with no URL" +#~ msgstr "Fjärr utan URL" + +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) tar inte argument" + +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "positivt värde förväntat objectname:short=%s" + +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "okänt %%(objectname)-argument: %s" + +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "flaggan \"%s\" är inkompatibel med --merged" + +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "flaggan \"%s\" är inkompatibel med --no-merged" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "kunde inte öppna \"%s\" för skrivning: %s" + +#~ msgid "could not read ref '%s'" +#~ msgstr "Kunde inte läsa referensen \"%s\"" + +#~ msgid "ref '%s' already exists" +#~ msgstr "referensen \"%s\" finns redan" + +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "oväntat objekt-id vid skrivning \"%s\"" + +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "oväntat objekt-id vid borttagning \"%s\"" + +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "Hashningsalgoritmen %s stöds inte i detta bygge." + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "kunde inte öppna filen BISECT_TERMS" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "" +#~ "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "skriv endast namn (ingen SHA-1)" + +#~ msgid "passed to 'git am'" +#~ msgstr "sänds till \"git am\"" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "Flaggan --cached kan inte användas med flaggan --files" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" + +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" + +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Varning: $display_name innehåller inte incheckningarna $sha1_src och " +#~ "$sha1_dst" + #~ msgid "Finding commits for commit graph from %d ref" #~ msgid_plural "Finding commits for commit graph from %d refs" #~ msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" @@ -25110,9 +25781,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "malformed ident line" #~ msgstr "felaktig ident-rad" -#~ msgid "corrupted author without date information" -#~ msgstr "trasig författare utan datuminformation" - #~ msgid "could not parse '%.*s'" #~ msgstr "kunde inte tolka \"%.*s\"" @@ -25143,18 +25811,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "no HEAD?" #~ msgstr "inget HEAD?" -#~ msgid "make committer date match author date" -#~ msgstr "sätt incheckningsdatum till författardatum" - -#~ msgid "ignore author date and use current date" -#~ msgstr "ignorera författardatum och använd nuvarande" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "synonym för --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "ignorera ändringar i blanksteg" - #~ msgid "preserve empty commits during rebase" #~ msgstr "behåll tomma incheckningar under ombasering" @@ -25170,9 +25826,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" @@ -25309,9 +25962,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "unrecognized verb: %s" #~ msgstr "okänt verb: %s" -#~ msgid "hash version %X does not match version %X" -#~ msgstr "hash-versionen %X stämmer inte med versionen %X" - #~ msgid "option '%s' requires a value" #~ msgstr "flaggan \"%s\" behöver ett värde" @@ -25539,7 +26189,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" @@ -25609,11 +26259,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." -#~ msgid "%" -#~ msgid_plural "%" -#~ msgstr[0] "%" -#~ msgstr[1] "%" - #~ msgid "%s, %" #~ msgid_plural "%s, %" #~ msgstr[0] "%s. %" @@ -25807,9 +26452,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Could not format %s." #~ msgstr "Kunde inte formatera %s." -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - #~ msgid "You need to set your committer info first" #~ msgstr "Du måste ställa in din incheckarinformation först" @@ -26002,9 +26644,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" @@ -26505,9 +27144,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" |