mirror of
https://github.com/git/git.git
synced 2024-03-28 23:49:59 +01:00
l10n: sv.po: Update Swedish translation (5230t0f0u)
Also fixed some typos reported by "git-po-helper". Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
parent
cfeae5a31e
commit
efedbb11de
1038
po/sv.po
1038
po/sv.po
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 2.33.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2021-08-03 17:06+0800\n"
|
||||
"PO-Revision-Date: 2021-08-09 20:35+0100\n"
|
||||
"POT-Creation-Date: 2021-08-14 07:56+0800\n"
|
||||
"PO-Revision-Date: 2021-08-14 21:14+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language: sv\n"
|
||||
|
@ -23,7 +23,7 @@ msgstr ""
|
|||
msgid "Huh (%s)?"
|
||||
msgstr "Vadå (%s)?"
|
||||
|
||||
#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
|
||||
#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
|
||||
#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
|
||||
#: builtin/rebase.c:1953
|
||||
msgid "could not read index"
|
||||
|
@ -53,7 +53,7 @@ msgstr "Uppdatera"
|
|||
msgid "could not stage '%s'"
|
||||
msgstr "kunde inte köa \"%s\""
|
||||
|
||||
#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
|
||||
#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
|
||||
msgid "could not write index"
|
||||
msgstr "kunde inte skriva indexet"
|
||||
|
||||
|
@ -212,9 +212,10 @@ msgstr "ej köad"
|
|||
#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
|
||||
#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
|
||||
#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
|
||||
#: builtin/submodule--helper.c:408 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
|
||||
#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
|
||||
#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
|
||||
#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
|
||||
#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
|
||||
#: git-add--interactive.perl:213
|
||||
msgid "path"
|
||||
msgstr "sökväg"
|
||||
|
@ -797,7 +798,7 @@ msgstr ""
|
|||
msgid "Exiting because of an unresolved conflict."
|
||||
msgstr "Avslutar på grund av olöst konflikgt."
|
||||
|
||||
#: advice.c:283 builtin/merge.c:1374
|
||||
#: advice.c:283 builtin/merge.c:1375
|
||||
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
||||
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
|
||||
|
||||
|
@ -1571,7 +1572,7 @@ msgstr "kan inte läsa %s"
|
|||
|
||||
#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
|
||||
#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
|
||||
#: builtin/merge.c:1143
|
||||
#: builtin/merge.c:1144
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
msgstr "kunde inte läsa \"%s\""
|
||||
|
@ -1660,7 +1661,8 @@ msgid "list supported archive formats"
|
|||
msgstr "visa understödda arkivformat"
|
||||
|
||||
#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
|
||||
#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
|
||||
#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
|
||||
#: builtin/submodule--helper.c:2902
|
||||
msgid "repo"
|
||||
msgstr "arkiv"
|
||||
|
||||
|
@ -1855,7 +1857,7 @@ msgstr ""
|
|||
"--reverse och --first-parent tillsammans kräver att du anger senaste "
|
||||
"incheckningen"
|
||||
|
||||
#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
|
||||
#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
|
||||
#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
|
||||
#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
|
||||
#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
|
||||
|
@ -3118,7 +3120,7 @@ msgstr "oväntad filtertyp"
|
|||
msgid "path name too long for external filter"
|
||||
msgstr "sökvägen för lång för externt filter"
|
||||
|
||||
#: convert.c:934
|
||||
#: convert.c:935
|
||||
#, c-format
|
||||
msgid ""
|
||||
"external filter '%s' is not available anymore although not all paths have "
|
||||
|
@ -3127,16 +3129,16 @@ msgstr ""
|
|||
"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
|
||||
"inte har filtrerats"
|
||||
|
||||
#: convert.c:1234
|
||||
#: convert.c:1236
|
||||
msgid "true/false are no valid working-tree-encodings"
|
||||
msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
|
||||
|
||||
#: convert.c:1414 convert.c:1447
|
||||
#: convert.c:1416 convert.c:1449
|
||||
#, c-format
|
||||
msgid "%s: clean filter '%s' failed"
|
||||
msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
|
||||
|
||||
#: convert.c:1490
|
||||
#: convert.c:1492
|
||||
#, c-format
|
||||
msgid "%s: smudge filter %s failed"
|
||||
msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
|
||||
|
@ -3314,7 +3316,7 @@ msgid ""
|
|||
"'dimmed-zebra', 'plain'"
|
||||
msgstr ""
|
||||
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
|
||||
"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
|
||||
"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
|
||||
|
||||
#: diff.c:325
|
||||
#, c-format
|
||||
|
@ -3355,7 +3357,7 @@ msgstr "extern diff dog, stannar vid %s"
|
|||
|
||||
#: diff.c:4634
|
||||
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
||||
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
|
||||
msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
|
||||
|
||||
#: diff.c:4637
|
||||
msgid "-G, -S and --find-object are mutually exclusive"
|
||||
|
@ -3370,10 +3372,10 @@ msgstr ""
|
|||
|
||||
#: diff.c:4643
|
||||
msgid ""
|
||||
"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
|
||||
"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
|
||||
"with -G and -S"
|
||||
msgstr ""
|
||||
"---pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
|
||||
"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
|
||||
"all med -G och -S"
|
||||
|
||||
#: diff.c:4722
|
||||
|
@ -3929,7 +3931,7 @@ msgstr ""
|
|||
msgid "failed to read orderfile '%s'"
|
||||
msgstr "kunde inte läsa orderfilen \"%s\""
|
||||
|
||||
#: diffcore-rename.c:1510
|
||||
#: diffcore-rename.c:1514
|
||||
msgid "Performing inexact rename detection"
|
||||
msgstr "Utför onöjaktig namnbytesdetektering"
|
||||
|
||||
|
@ -3948,51 +3950,51 @@ msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
|
|||
msgid "unrecognized pattern: '%s'"
|
||||
msgstr "okänt mönster: %s"
|
||||
|
||||
#: dir.c:792 dir.c:806
|
||||
#: dir.c:790 dir.c:804
|
||||
#, c-format
|
||||
msgid "unrecognized negative pattern: '%s'"
|
||||
msgstr "okänt negativt mönster: %s"
|
||||
|
||||
#: dir.c:824
|
||||
#: dir.c:820
|
||||
#, c-format
|
||||
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
|
||||
msgstr ""
|
||||
"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
|
||||
"gånger"
|
||||
|
||||
#: dir.c:834
|
||||
#: dir.c:830
|
||||
msgid "disabling cone pattern matching"
|
||||
msgstr "inaktiverar konmönstermatchning"
|
||||
|
||||
#: dir.c:1221
|
||||
#: dir.c:1214
|
||||
#, c-format
|
||||
msgid "cannot use %s as an exclude file"
|
||||
msgstr "kan inte använda %s som exkluderingsfil"
|
||||
|
||||
#: dir.c:2358
|
||||
#: dir.c:2351
|
||||
#, c-format
|
||||
msgid "could not open directory '%s'"
|
||||
msgstr "kunde inte öppna katalogen \"%s\""
|
||||
|
||||
#: dir.c:2660
|
||||
#: dir.c:2653
|
||||
msgid "failed to get kernel name and information"
|
||||
msgstr "misslyckades hämta kärnans namn och information"
|
||||
|
||||
#: dir.c:2784
|
||||
#: dir.c:2777
|
||||
msgid "untracked cache is disabled on this system or location"
|
||||
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
|
||||
|
||||
#: dir.c:3617
|
||||
#: dir.c:3610
|
||||
#, c-format
|
||||
msgid "index file corrupt in repo %s"
|
||||
msgstr "indexfilen trasig i arkivet %s"
|
||||
|
||||
#: dir.c:3664 dir.c:3669
|
||||
#: dir.c:3657 dir.c:3662
|
||||
#, c-format
|
||||
msgid "could not create directories for %s"
|
||||
msgstr "kunde inte skapa kataloger för %s"
|
||||
|
||||
#: dir.c:3698
|
||||
#: dir.c:3691
|
||||
#, c-format
|
||||
msgid "could not migrate git directory from '%s' to '%s'"
|
||||
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
|
||||
|
@ -4016,7 +4018,7 @@ msgstr "kunde inte ta status på filen \"%s\""
|
|||
msgid "bad git namespace path \"%s\""
|
||||
msgstr "felaktig git-namnrymdssökväg \"%s\""
|
||||
|
||||
#: environment.c:335
|
||||
#: environment.c:334
|
||||
#, c-format
|
||||
msgid "could not set GIT_DIR to '%s'"
|
||||
msgstr "kunde inte ställa in GIT_DIR till \"%s\""
|
||||
|
@ -4183,7 +4185,7 @@ msgstr "källarkivet är grunt, tillåter inte kloning."
|
|||
|
||||
#: fetch-pack.c:1128 fetch-pack.c:1660
|
||||
msgid "git fetch-pack: fetch failed."
|
||||
msgstr "git fetch-patch: hämtning misslyckades."
|
||||
msgstr "git fetch-pack: hämtning misslyckades."
|
||||
|
||||
#: fetch-pack.c:1242
|
||||
#, c-format
|
||||
|
@ -4651,34 +4653,34 @@ msgstr "citerad CRLF upptäcktes"
|
|||
msgid "bad action '%s' for '%s'"
|
||||
msgstr "felaktig funktion \"%s\" för \"%s\""
|
||||
|
||||
#: merge-ort.c:1228 merge-recursive.c:1206
|
||||
#: merge-ort.c:1569 merge-recursive.c:1201
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (not checked out)"
|
||||
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
|
||||
|
||||
#: merge-ort.c:1237 merge-recursive.c:1213
|
||||
#: merge-ort.c:1578 merge-recursive.c:1208
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (commits not present)"
|
||||
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
|
||||
|
||||
#: merge-ort.c:1246 merge-recursive.c:1220
|
||||
#: merge-ort.c:1587 merge-recursive.c:1215
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
|
||||
msgstr ""
|
||||
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
|
||||
"sammanslagningsbasen)"
|
||||
|
||||
#: merge-ort.c:1256 merge-ort.c:1263
|
||||
#: merge-ort.c:1597 merge-ort.c:1604
|
||||
#, c-format
|
||||
msgid "Note: Fast-forwarding submodule %s to %s"
|
||||
msgstr "Obs: Snabbspolar undermodulen %s till %s"
|
||||
|
||||
#: merge-ort.c:1284
|
||||
#: merge-ort.c:1625
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s"
|
||||
msgstr "Misslyckades slå ihop undermodulen %s"
|
||||
|
||||
#: merge-ort.c:1291
|
||||
#: merge-ort.c:1632
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
|
||||
|
@ -4687,7 +4689,7 @@ msgstr ""
|
|||
"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
|
||||
"%s\n"
|
||||
|
||||
#: merge-ort.c:1295 merge-recursive.c:1274
|
||||
#: merge-ort.c:1636 merge-recursive.c:1269
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If this is correct simply add it to the index for example\n"
|
||||
|
@ -4704,7 +4706,7 @@ msgstr ""
|
|||
"\n"
|
||||
"vilket godtar lösningen.\n"
|
||||
|
||||
#: merge-ort.c:1308
|
||||
#: merge-ort.c:1649
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Failed to merge submodule %s, but multiple possible merges exist:\n"
|
||||
|
@ -4714,21 +4716,21 @@ msgstr ""
|
|||
"finns:\n"
|
||||
"%s"
|
||||
|
||||
#: merge-ort.c:1527 merge-recursive.c:1363
|
||||
#: merge-ort.c:1868 merge-recursive.c:1358
|
||||
msgid "Failed to execute internal merge"
|
||||
msgstr "Misslyckades exekvera intern sammanslagning"
|
||||
|
||||
#: merge-ort.c:1532 merge-recursive.c:1368
|
||||
#: merge-ort.c:1873 merge-recursive.c:1363
|
||||
#, c-format
|
||||
msgid "Unable to add %s to database"
|
||||
msgstr "Kunde inte lägga till %s till databasen"
|
||||
|
||||
#: merge-ort.c:1539 merge-recursive.c:1401
|
||||
#: merge-ort.c:1880 merge-recursive.c:1396
|
||||
#, c-format
|
||||
msgid "Auto-merging %s"
|
||||
msgstr "Slår ihop %s automatiskt"
|
||||
|
||||
#: merge-ort.c:1678 merge-recursive.c:2123
|
||||
#: merge-ort.c:2019 merge-recursive.c:2118
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
|
||||
|
@ -4737,7 +4739,7 @@ msgstr ""
|
|||
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
|
||||
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
|
||||
|
||||
#: merge-ort.c:1688 merge-recursive.c:2133
|
||||
#: merge-ort.c:2029 merge-recursive.c:2128
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
|
||||
|
@ -4746,7 +4748,7 @@ msgstr ""
|
|||
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
|
||||
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
|
||||
|
||||
#: merge-ort.c:1746
|
||||
#: merge-ort.c:2087
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
|
||||
|
@ -4757,7 +4759,7 @@ msgstr ""
|
|||
"den har namnbytts till flera andra kataloger, utan att någon destination "
|
||||
"fick en majoritet av filerna."
|
||||
|
||||
#: merge-ort.c:1900 merge-recursive.c:2469
|
||||
#: merge-ort.c:2241 merge-recursive.c:2464
|
||||
#, c-format
|
||||
msgid ""
|
||||
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
|
||||
|
@ -4766,7 +4768,7 @@ msgstr ""
|
|||
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
|
||||
"bytt namn."
|
||||
|
||||
#: merge-ort.c:2044 merge-recursive.c:3252
|
||||
#: merge-ort.c:2385 merge-recursive.c:3247
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Path updated: %s added in %s inside a directory that was renamed in %s; "
|
||||
|
@ -4775,7 +4777,7 @@ msgstr ""
|
|||
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
|
||||
"flyttar den till %s."
|
||||
|
||||
#: merge-ort.c:2051 merge-recursive.c:3259
|
||||
#: merge-ort.c:2392 merge-recursive.c:3254
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
|
||||
|
@ -4784,7 +4786,7 @@ msgstr ""
|
|||
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
|
||||
"namn i %s; flyttar den till %s."
|
||||
|
||||
#: merge-ort.c:2064 merge-recursive.c:3255
|
||||
#: merge-ort.c:2405 merge-recursive.c:3250
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
|
||||
|
@ -4793,7 +4795,7 @@ msgstr ""
|
|||
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
|
||||
"%s, föreslår att den bör flyttas till%s."
|
||||
|
||||
#: merge-ort.c:2072 merge-recursive.c:3262
|
||||
#: merge-ort.c:2413 merge-recursive.c:3257
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
|
||||
|
@ -4802,13 +4804,13 @@ msgstr ""
|
|||
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
|
||||
"bytte namn i %s; flyttar den till %s."
|
||||
|
||||
#: merge-ort.c:2228
|
||||
#: merge-ort.c:2569
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
|
||||
msgstr ""
|
||||
"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
|
||||
|
||||
#: merge-ort.c:2323
|
||||
#: merge-ort.c:2664
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
|
||||
|
@ -4819,23 +4821,23 @@ msgstr ""
|
|||
"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
|
||||
"nästlade konfliktmarkörer."
|
||||
|
||||
#: merge-ort.c:2342 merge-ort.c:2366
|
||||
#: merge-ort.c:2683 merge-ort.c:2707
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
|
||||
msgstr ""
|
||||
"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
|
||||
|
||||
#: merge-ort.c:2819 merge-recursive.c:3013
|
||||
#: merge-ort.c:3182 merge-recursive.c:3008
|
||||
#, c-format
|
||||
msgid "cannot read object %s"
|
||||
msgstr "kan inte läsa objektet %s"
|
||||
|
||||
#: merge-ort.c:2822 merge-recursive.c:3016
|
||||
#: merge-ort.c:3185 merge-recursive.c:3011
|
||||
#, c-format
|
||||
msgid "object %s is not a blob"
|
||||
msgstr "objektet %s är inte en blob"
|
||||
|
||||
#: merge-ort.c:3250
|
||||
#: merge-ort.c:3613
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
|
||||
|
@ -4844,7 +4846,7 @@ msgstr ""
|
|||
"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
|
||||
"till %s istället."
|
||||
|
||||
#: merge-ort.c:3326
|
||||
#: merge-ort.c:3689
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (distinct types): %s had different types on each side; renamed both "
|
||||
|
@ -4853,7 +4855,7 @@ msgstr ""
|
|||
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
|
||||
"så att de kan protokollföras någonstans."
|
||||
|
||||
#: merge-ort.c:3333
|
||||
#: merge-ort.c:3696
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (distinct types): %s had different types on each side; renamed one "
|
||||
|
@ -4862,24 +4864,24 @@ msgstr ""
|
|||
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
|
||||
"så att de kan protokollföras någonstans."
|
||||
|
||||
#: merge-ort.c:3433 merge-recursive.c:3092
|
||||
#: merge-ort.c:3796 merge-recursive.c:3087
|
||||
msgid "content"
|
||||
msgstr "innehåll"
|
||||
|
||||
#: merge-ort.c:3435 merge-recursive.c:3096
|
||||
#: merge-ort.c:3798 merge-recursive.c:3091
|
||||
msgid "add/add"
|
||||
msgstr "tillägg/tillägg"
|
||||
|
||||
#: merge-ort.c:3437 merge-recursive.c:3141
|
||||
#: merge-ort.c:3800 merge-recursive.c:3136
|
||||
msgid "submodule"
|
||||
msgstr "undermodul"
|
||||
|
||||
#: merge-ort.c:3439 merge-recursive.c:3142
|
||||
#: merge-ort.c:3802 merge-recursive.c:3137
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): Merge conflict in %s"
|
||||
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
|
||||
|
||||
#: merge-ort.c:3470
|
||||
#: merge-ort.c:3833
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
|
||||
|
@ -4888,7 +4890,7 @@ msgstr ""
|
|||
"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
|
||||
"lämnad i trädet."
|
||||
|
||||
#: merge-ort.c:3757
|
||||
#: merge-ort.c:4120
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Note: %s not up to date and in way of checking out conflicted version; old "
|
||||
|
@ -4900,12 +4902,12 @@ msgstr ""
|
|||
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
|
||||
#. base, and 2-3) the trees for the two trees we're merging.
|
||||
#.
|
||||
#: merge-ort.c:4116
|
||||
#: merge-ort.c:4487
|
||||
#, c-format
|
||||
msgid "collecting merge info failed for trees %s, %s, %s"
|
||||
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
|
||||
|
||||
#: merge-ort-wrappers.c:13 merge-recursive.c:3707
|
||||
#: merge-ort-wrappers.c:13 merge-recursive.c:3702
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your local changes to the following files would be overwritten by merge:\n"
|
||||
|
@ -4915,109 +4917,109 @@ msgstr ""
|
|||
"sammanslagning:\n"
|
||||
" %s"
|
||||
|
||||
#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
|
||||
#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
|
||||
msgid "Already up to date."
|
||||
msgstr "Redan à jour."
|
||||
|
||||
#: merge-recursive.c:357
|
||||
#: merge-recursive.c:352
|
||||
msgid "(bad commit)\n"
|
||||
msgstr "(felaktig incheckning)\n"
|
||||
|
||||
#: merge-recursive.c:380
|
||||
#: merge-recursive.c:375
|
||||
#, c-format
|
||||
msgid "add_cacheinfo failed for path '%s'; merge aborting."
|
||||
msgstr ""
|
||||
"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
|
||||
|
||||
#: merge-recursive.c:389
|
||||
#: merge-recursive.c:384
|
||||
#, c-format
|
||||
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
|
||||
msgstr ""
|
||||
"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
|
||||
"sammanslagningen."
|
||||
|
||||
#: merge-recursive.c:877
|
||||
#: merge-recursive.c:872
|
||||
#, c-format
|
||||
msgid "failed to create path '%s'%s"
|
||||
msgstr "misslyckades skapa sökvägen \"%s\"%s"
|
||||
|
||||
#: merge-recursive.c:888
|
||||
#: merge-recursive.c:883
|
||||
#, c-format
|
||||
msgid "Removing %s to make room for subdirectory\n"
|
||||
msgstr "Tar bort %s för att göra plats för underkatalog\n"
|
||||
|
||||
#: merge-recursive.c:902 merge-recursive.c:921
|
||||
#: merge-recursive.c:897 merge-recursive.c:916
|
||||
msgid ": perhaps a D/F conflict?"
|
||||
msgstr ": kanske en K/F-konflikt?"
|
||||
|
||||
#: merge-recursive.c:911
|
||||
#: merge-recursive.c:906
|
||||
#, c-format
|
||||
msgid "refusing to lose untracked file at '%s'"
|
||||
msgstr "vägrar förlora ospårad fil vid \"%s\""
|
||||
|
||||
#: merge-recursive.c:952 builtin/cat-file.c:41
|
||||
#: merge-recursive.c:947 builtin/cat-file.c:41
|
||||
#, c-format
|
||||
msgid "cannot read object %s '%s'"
|
||||
msgstr "kan inte läsa objektet %s: \"%s\""
|
||||
|
||||
#: merge-recursive.c:957
|
||||
#: merge-recursive.c:952
|
||||
#, c-format
|
||||
msgid "blob expected for %s '%s'"
|
||||
msgstr "blob förväntades för %s \"%s\""
|
||||
|
||||
#: merge-recursive.c:982
|
||||
#: merge-recursive.c:977
|
||||
#, c-format
|
||||
msgid "failed to open '%s': %s"
|
||||
msgstr "misslyckades öppna \"%s\": %s"
|
||||
|
||||
#: merge-recursive.c:993
|
||||
#: merge-recursive.c:988
|
||||
#, c-format
|
||||
msgid "failed to symlink '%s': %s"
|
||||
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
|
||||
|
||||
#: merge-recursive.c:998
|
||||
#: merge-recursive.c:993
|
||||
#, c-format
|
||||
msgid "do not know what to do with %06o %s '%s'"
|
||||
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
|
||||
|
||||
#: merge-recursive.c:1228 merge-recursive.c:1240
|
||||
#: merge-recursive.c:1223 merge-recursive.c:1235
|
||||
#, c-format
|
||||
msgid "Fast-forwarding submodule %s to the following commit:"
|
||||
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
|
||||
|
||||
#: merge-recursive.c:1231 merge-recursive.c:1243
|
||||
#: merge-recursive.c:1226 merge-recursive.c:1238
|
||||
#, c-format
|
||||
msgid "Fast-forwarding submodule %s"
|
||||
msgstr "Snabbspolar undermodulen %s"
|
||||
|
||||
#: merge-recursive.c:1266
|
||||
#: merge-recursive.c:1261
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (merge following commits not found)"
|
||||
msgstr ""
|
||||
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
|
||||
"hittades inte)"
|
||||
|
||||
#: merge-recursive.c:1270
|
||||
#: merge-recursive.c:1265
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (not fast-forward)"
|
||||
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
|
||||
|
||||
#: merge-recursive.c:1271
|
||||
#: merge-recursive.c:1266
|
||||
msgid "Found a possible merge resolution for the submodule:\n"
|
||||
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
|
||||
|
||||
#: merge-recursive.c:1283
|
||||
#: merge-recursive.c:1278
|
||||
#, c-format
|
||||
msgid "Failed to merge submodule %s (multiple merges found)"
|
||||
msgstr ""
|
||||
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
|
||||
|
||||
#: merge-recursive.c:1425
|
||||
#: merge-recursive.c:1420
|
||||
#, c-format
|
||||
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
|
||||
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
|
||||
|
||||
#: merge-recursive.c:1497
|
||||
#: merge-recursive.c:1492
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
||||
|
@ -5026,7 +5028,7 @@ msgstr ""
|
|||
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
|
||||
"i trädet."
|
||||
|
||||
#: merge-recursive.c:1502
|
||||
#: merge-recursive.c:1497
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
||||
|
@ -5035,7 +5037,7 @@ msgstr ""
|
|||
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
|
||||
"%s lämnad i trädet."
|
||||
|
||||
#: merge-recursive.c:1509
|
||||
#: merge-recursive.c:1504
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
||||
|
@ -5044,7 +5046,7 @@ msgstr ""
|
|||
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
|
||||
"i trädet vid %s."
|
||||
|
||||
#: merge-recursive.c:1514
|
||||
#: merge-recursive.c:1509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
||||
|
@ -5053,40 +5055,40 @@ msgstr ""
|
|||
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
|
||||
"%s lämnad i trädet vid %s."
|
||||
|
||||
#: merge-recursive.c:1549
|
||||
#: merge-recursive.c:1544
|
||||
msgid "rename"
|
||||
msgstr "namnbyte"
|
||||
|
||||
#: merge-recursive.c:1549
|
||||
#: merge-recursive.c:1544
|
||||
msgid "renamed"
|
||||
msgstr "namnbytt"
|
||||
|
||||
#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
|
||||
#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
|
||||
#, c-format
|
||||
msgid "Refusing to lose dirty file at %s"
|
||||
msgstr "Vägrar förlora lortig fil vid \"%s\""
|
||||
|
||||
#: merge-recursive.c:1610
|
||||
#: merge-recursive.c:1605
|
||||
#, c-format
|
||||
msgid "Refusing to lose untracked file at %s, even though it's in the way."
|
||||
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
|
||||
|
||||
#: merge-recursive.c:1668
|
||||
#: merge-recursive.c:1663
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
|
||||
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
|
||||
|
||||
#: merge-recursive.c:1699
|
||||
#: merge-recursive.c:1694
|
||||
#, c-format
|
||||
msgid "%s is a directory in %s adding as %s instead"
|
||||
msgstr "%s är en katalog i %s lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:1704
|
||||
#: merge-recursive.c:1699
|
||||
#, c-format
|
||||
msgid "Refusing to lose untracked file at %s; adding as %s instead"
|
||||
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:1731
|
||||
#: merge-recursive.c:1726
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
||||
|
@ -5095,17 +5097,17 @@ msgstr ""
|
|||
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
|
||||
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
|
||||
|
||||
#: merge-recursive.c:1736
|
||||
#: merge-recursive.c:1731
|
||||
msgid " (left unresolved)"
|
||||
msgstr " (lämnad olöst)"
|
||||
|
||||
#: merge-recursive.c:1828
|
||||
#: merge-recursive.c:1823
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
||||
msgstr ""
|
||||
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
|
||||
|
||||
#: merge-recursive.c:2091
|
||||
#: merge-recursive.c:2086
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (directory rename split): Unclear where to place %s because "
|
||||
|
@ -5116,7 +5118,7 @@ msgstr ""
|
|||
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
|
||||
"destination fick en majoritet av filerna."
|
||||
|
||||
#: merge-recursive.c:2225
|
||||
#: merge-recursive.c:2220
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
|
||||
|
@ -5125,79 +5127,79 @@ msgstr ""
|
|||
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
|
||||
"%s->%s i %s"
|
||||
|
||||
#: merge-recursive.c:3080
|
||||
#: merge-recursive.c:3075
|
||||
msgid "modify"
|
||||
msgstr "ändra"
|
||||
|
||||
#: merge-recursive.c:3080
|
||||
#: merge-recursive.c:3075
|
||||
msgid "modified"
|
||||
msgstr "ändrad"
|
||||
|
||||
#: merge-recursive.c:3119
|
||||
#: merge-recursive.c:3114
|
||||
#, c-format
|
||||
msgid "Skipped %s (merged same as existing)"
|
||||
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
|
||||
|
||||
#: merge-recursive.c:3172
|
||||
#: merge-recursive.c:3167
|
||||
#, c-format
|
||||
msgid "Adding as %s instead"
|
||||
msgstr "Lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:3376
|
||||
#: merge-recursive.c:3371
|
||||
#, c-format
|
||||
msgid "Removing %s"
|
||||
msgstr "Tar bort %s"
|
||||
|
||||
#: merge-recursive.c:3399
|
||||
#: merge-recursive.c:3394
|
||||
msgid "file/directory"
|
||||
msgstr "fil/katalog"
|
||||
|
||||
#: merge-recursive.c:3404
|
||||
#: merge-recursive.c:3399
|
||||
msgid "directory/file"
|
||||
msgstr "katalog/fil"
|
||||
|
||||
#: merge-recursive.c:3411
|
||||
#: merge-recursive.c:3406
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
||||
msgstr ""
|
||||
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
|
||||
|
||||
#: merge-recursive.c:3420
|
||||
#: merge-recursive.c:3415
|
||||
#, c-format
|
||||
msgid "Adding %s"
|
||||
msgstr "Lägger till %s"
|
||||
|
||||
#: merge-recursive.c:3429
|
||||
#: merge-recursive.c:3424
|
||||
#, c-format
|
||||
msgid "CONFLICT (add/add): Merge conflict in %s"
|
||||
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
|
||||
|
||||
#: merge-recursive.c:3482
|
||||
#: merge-recursive.c:3477
|
||||
#, c-format
|
||||
msgid "merging of trees %s and %s failed"
|
||||
msgstr "sammanslagning av träden %s och %s misslyckades"
|
||||
|
||||
#: merge-recursive.c:3576
|
||||
#: merge-recursive.c:3571
|
||||
msgid "Merging:"
|
||||
msgstr "Slår ihop:"
|
||||
|
||||
#: merge-recursive.c:3589
|
||||
#: merge-recursive.c:3584
|
||||
#, 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:3639
|
||||
#: merge-recursive.c:3634
|
||||
msgid "merge returned no commit"
|
||||
msgstr "sammanslagningen returnerade ingen incheckning"
|
||||
|
||||
#: merge-recursive.c:3804
|
||||
#: merge-recursive.c:3799
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'"
|
||||
msgstr "Kunde inte tolka objektet \"%s\""
|
||||
|
||||
#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
|
||||
#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
|
||||
#: builtin/stash.c:473
|
||||
msgid "Unable to write index."
|
||||
msgstr "Kunde inte skriva indexet."
|
||||
|
@ -5207,7 +5209,7 @@ msgid "failed to read the cache"
|
|||
msgstr "misslyckades läsa cachen"
|
||||
|
||||
#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
|
||||
#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
|
||||
#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
|
||||
#: builtin/stash.c:267
|
||||
msgid "unable to write new index file"
|
||||
msgstr "kunde inte skriva ny indexfil"
|
||||
|
@ -6337,10 +6339,10 @@ msgstr "osorterade köposter för \"%s\""
|
|||
|
||||
#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
|
||||
#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
|
||||
#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
|
||||
#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
|
||||
#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
|
||||
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
|
||||
#: builtin/submodule--helper.c:331
|
||||
#: builtin/submodule--helper.c:333
|
||||
msgid "index file corrupt"
|
||||
msgstr "indexfilen trasig"
|
||||
|
||||
|
@ -6394,36 +6396,36 @@ msgstr "kunde inte uppdatera delat index \"%s\""
|
|||
msgid "broken index, expect %s in %s, got %s"
|
||||
msgstr "trasigt index, förväntade %s i %s, fick %s"
|
||||
|
||||
#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
|
||||
#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
|
||||
#, c-format
|
||||
msgid "could not close '%s'"
|
||||
msgstr "kunde inte stänga \"%s\""
|
||||
|
||||
#: read-cache.c:3074
|
||||
#: read-cache.c:3075
|
||||
msgid "failed to convert to a sparse-index"
|
||||
msgstr "misslyckades omvandla till glest index"
|
||||
|
||||
#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
|
||||
#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
|
||||
#, c-format
|
||||
msgid "could not stat '%s'"
|
||||
msgstr "kunde inte ta status på \"%s\""
|
||||
|
||||
#: read-cache.c:3158
|
||||
#: read-cache.c:3159
|
||||
#, c-format
|
||||
msgid "unable to open git dir: %s"
|
||||
msgstr "kunde inte öppna git-katalog: %s"
|
||||
|
||||
#: read-cache.c:3170
|
||||
#: read-cache.c:3171
|
||||
#, c-format
|
||||
msgid "unable to unlink: %s"
|
||||
msgstr "misslyckades ta bort länken: %s"
|
||||
|
||||
#: read-cache.c:3199
|
||||
#: read-cache.c:3200
|
||||
#, c-format
|
||||
msgid "cannot fix permission bits on '%s'"
|
||||
msgstr "kan inte rätta behörighetsbitar på \"%s\""
|
||||
|
||||
#: read-cache.c:3348
|
||||
#: read-cache.c:3349
|
||||
#, c-format
|
||||
msgid "%s: cannot drop to stage #0"
|
||||
msgstr "%s: kan inte återgå till kö 0"
|
||||
|
@ -6845,17 +6847,17 @@ msgstr "ignorerar referens med trasigt namn %s"
|
|||
msgid "ignoring broken ref %s"
|
||||
msgstr "ignorerar trasig referens %s"
|
||||
|
||||
#: ref-filter.c:2498
|
||||
#: ref-filter.c:2502
|
||||
#, c-format
|
||||
msgid "format: %%(end) atom missing"
|
||||
msgstr "format: atomen %%(end) saknas"
|
||||
|
||||
#: ref-filter.c:2592
|
||||
#: ref-filter.c:2596
|
||||
#, c-format
|
||||
msgid "malformed object name %s"
|
||||
msgstr "felformat objektnamn %s"
|
||||
|
||||
#: ref-filter.c:2597
|
||||
#: ref-filter.c:2601
|
||||
#, c-format
|
||||
msgid "option `%s' must point to a commit"
|
||||
msgstr "flaggan \"%s\" måste peka på en incheckning"
|
||||
|
@ -6885,7 +6887,7 @@ msgstr ""
|
|||
"\n"
|
||||
"\tgit config --global init.defaultBranch <namn>\n"
|
||||
"\n"
|
||||
"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n"
|
||||
"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
|
||||
"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
|
||||
"\n"
|
||||
"\tgit branch -m <namn>\n"
|
||||
|
@ -7312,7 +7314,7 @@ msgid "Recorded preimage for '%s'"
|
|||
msgstr "Sparade förhandsbild för \"%s\""
|
||||
|
||||
#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
|
||||
#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
|
||||
#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
|
||||
#, c-format
|
||||
msgid "could not create directory '%s'"
|
||||
msgstr "kunde inte skapa katalogen \"%s\""
|
||||
|
@ -7350,7 +7352,7 @@ 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:3689
|
||||
#: reset.c:69 reset.c:75 sequencer.c:3689
|
||||
#, c-format
|
||||
msgid "failed to find tree of %s"
|
||||
msgstr "kunde inte hitta trädet för %s."
|
||||
|
@ -7558,7 +7560,7 @@ msgid "unable to dequote value of '%s'"
|
|||
msgstr "kan inte ta bort citering av värdet \"%s\""
|
||||
|
||||
#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
|
||||
#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
|
||||
#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
|
||||
#, c-format
|
||||
msgid "could not open '%s' for reading"
|
||||
msgstr "kunde inte öppna \"%s\" för läsning"
|
||||
|
@ -7706,7 +7708,7 @@ msgstr "kunde inte tolka HEAD"
|
|||
msgid "HEAD %s is not a commit!"
|
||||
msgstr "HEAD %s är inte en incheckning!"
|
||||
|
||||
#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
|
||||
#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
|
||||
msgid "could not parse HEAD commit"
|
||||
msgstr "kunde inte tolka HEAD:s incheckning"
|
||||
|
||||
|
@ -7714,7 +7716,7 @@ msgstr "kunde inte tolka HEAD:s incheckning"
|
|||
msgid "unable to parse commit author"
|
||||
msgstr "kunde inte tolka incheckningens författare"
|
||||
|
||||
#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
|
||||
#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
|
||||
msgid "git write-tree failed to write a tree"
|
||||
msgstr "git write-tree misslyckades skriva ett träd"
|
||||
|
||||
|
@ -7732,8 +7734,8 @@ msgstr "ogiltig författar-identitet \"%s\""
|
|||
msgid "corrupt author: missing date information"
|
||||
msgstr "trasig författare: saknar datuminformation"
|
||||
|
||||
#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
|
||||
#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
|
||||
#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
|
||||
#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
|
||||
msgid "failed to write commit object"
|
||||
msgstr "kunde inte skriva incheckningsobjekt"
|
||||
|
||||
|
@ -8524,11 +8526,11 @@ msgstr "\"setsid\" misslyckades"
|
|||
msgid "attempting to use sparse-index without cone mode"
|
||||
msgstr "försöker använda glest index utan \"cone\"-läge"
|
||||
|
||||
#: sparse-index.c:174
|
||||
#: sparse-index.c:176
|
||||
msgid "unable to update cache-tree, staying full"
|
||||
msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
|
||||
|
||||
#: sparse-index.c:261
|
||||
#: sparse-index.c:263
|
||||
#, c-format
|
||||
msgid "index entry is a directory, but not sparse (%08x)"
|
||||
msgstr "indexposten är en katalog, men inte gles (%08x)"
|
||||
|
@ -8683,7 +8685,7 @@ msgstr ""
|
|||
msgid "process for submodule '%s' failed"
|
||||
msgstr "process för undermodulen \"%s\" misslyckades"
|
||||
|
||||
#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
|
||||
#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
|
||||
msgid "Failed to resolve HEAD as a valid ref."
|
||||
msgstr "Misslyckades slå upp HEAD som giltig referens."
|
||||
|
||||
|
@ -9432,7 +9434,7 @@ msgstr ""
|
|||
msgid "Updating index flags"
|
||||
msgstr "Uppdaterar indexflaggor"
|
||||
|
||||
#: unpack-trees.c:2707
|
||||
#: unpack-trees.c:2718
|
||||
#, c-format
|
||||
msgid "worktree and untracked commit have duplicate entries: %s"
|
||||
msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
|
||||
|
@ -10217,7 +10219,7 @@ msgstr "testkörning"
|
|||
msgid "interactive picking"
|
||||
msgstr "plocka interaktivt"
|
||||
|
||||
#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
|
||||
#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
|
||||
msgid "select hunks interactively"
|
||||
msgstr "välj stycken interaktivt"
|
||||
|
||||
|
@ -10346,14 +10348,14 @@ msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
|
|||
#: builtin/add.c:526
|
||||
#, c-format
|
||||
msgid "--chmod param '%s' must be either -x or +x"
|
||||
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
|
||||
msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x"
|
||||
|
||||
#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
|
||||
#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
|
||||
#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
|
||||
msgid "--pathspec-from-file is incompatible with pathspec arguments"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
|
||||
|
||||
#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
|
||||
#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
|
||||
#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
|
||||
msgid "--pathspec-file-nul requires --pathspec-from-file"
|
||||
msgstr "--pathspec-file-nul kräver --pathspec-from-file"
|
||||
|
@ -11175,7 +11177,7 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
|
|||
msgid "show work cost statistics"
|
||||
msgstr "visa statistik över arbetskostnad"
|
||||
|
||||
#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
|
||||
#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
|
||||
#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
|
||||
#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
|
||||
#: builtin/push.c:566 builtin/send-pack.c:198
|
||||
|
@ -11532,7 +11534,7 @@ msgstr "visa endast grenar som inte innehåller incheckningen"
|
|||
|
||||
#: builtin/branch.c:650
|
||||
msgid "Specific git-branch actions:"
|
||||
msgstr "Specifika git-branch-åtgärder:"
|
||||
msgstr "Specifika git-branch åtgärder:"
|
||||
|
||||
#: builtin/branch.c:651
|
||||
msgid "list both remote-tracking and local branches"
|
||||
|
@ -11970,7 +11972,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:1520 builtin/gc.c:549
|
||||
#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
|
||||
#: builtin/worktree.c:493
|
||||
msgid "suppress progress reporting"
|
||||
msgstr "undertryck förloppsrapportering"
|
||||
|
@ -12029,9 +12031,10 @@ msgid "git checkout--worker [<options>]"
|
|||
msgstr "git checkout--worker [<flaggor>]"
|
||||
|
||||
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
|
||||
#: builtin/column.c:31 builtin/submodule--helper.c:1824
|
||||
#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
|
||||
#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
|
||||
#: builtin/column.c:31 builtin/submodule--helper.c:1892
|
||||
#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
|
||||
#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
|
||||
#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
|
||||
#: builtin/worktree.c:728
|
||||
msgid "string"
|
||||
msgstr "sträng"
|
||||
|
@ -12126,68 +12129,68 @@ msgstr "sökväg \"%s\": kan inte slå ihop"
|
|||
msgid "Unable to add merge result for '%s'"
|
||||
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
|
||||
|
||||
#: builtin/checkout.c:414
|
||||
#: builtin/checkout.c:411
|
||||
#, c-format
|
||||
msgid "Recreated %d merge conflict"
|
||||
msgid_plural "Recreated %d merge conflicts"
|
||||
msgstr[0] "Återskapade %d sammanslagningskonflikt"
|
||||
msgstr[1] "Återskapade %d sammanslagningskonflikter"
|
||||
|
||||
#: builtin/checkout.c:419
|
||||
#: builtin/checkout.c:416
|
||||
#, c-format
|
||||
msgid "Updated %d path from %s"
|
||||
msgid_plural "Updated %d paths from %s"
|
||||
msgstr[0] "Uppdaterade %d sökväg från %s"
|
||||
msgstr[1] "Uppdaterade %d sökvägar från %s"
|
||||
|
||||
#: builtin/checkout.c:426
|
||||
#: builtin/checkout.c:423
|
||||
#, c-format
|
||||
msgid "Updated %d path from the index"
|
||||
msgid_plural "Updated %d paths from the index"
|
||||
msgstr[0] "Uppdaterade %d sökväg från indexet"
|
||||
msgstr[1] "Uppdaterade %d sökvägar från indexet"
|
||||
|
||||
#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
|
||||
#: builtin/checkout.c:459
|
||||
#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
|
||||
#: builtin/checkout.c:456
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with updating paths"
|
||||
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
|
||||
|
||||
#: builtin/checkout.c:462 builtin/checkout.c:465
|
||||
#: builtin/checkout.c:459 builtin/checkout.c:462
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with %s"
|
||||
msgstr "\"%s\" kan inte användas med %s"
|
||||
|
||||
#: builtin/checkout.c:469
|
||||
#: builtin/checkout.c:466
|
||||
#, c-format
|
||||
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
||||
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
|
||||
|
||||
#: builtin/checkout.c:473
|
||||
#: builtin/checkout.c:470
|
||||
#, c-format
|
||||
msgid "neither '%s' or '%s' is specified"
|
||||
msgstr "varken \"%s\" eller \"%s\" har angivits"
|
||||
|
||||
#: builtin/checkout.c:477
|
||||
#: builtin/checkout.c:474
|
||||
#, c-format
|
||||
msgid "'%s' must be used when '%s' is not specified"
|
||||
msgstr "\"%s\" måste användas när \"%s\" inte anges"
|
||||
|
||||
#: builtin/checkout.c:482 builtin/checkout.c:487
|
||||
#: builtin/checkout.c:479 builtin/checkout.c:484
|
||||
#, c-format
|
||||
msgid "'%s' or '%s' cannot be used with %s"
|
||||
msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
|
||||
|
||||
#: builtin/checkout.c:563 builtin/checkout.c:570
|
||||
#: builtin/checkout.c:558 builtin/checkout.c:565
|
||||
#, c-format
|
||||
msgid "path '%s' is unmerged"
|
||||
msgstr "sökvägen \"%s\" har inte slagits ihop"
|
||||
|
||||
#: builtin/checkout.c:739
|
||||
#: builtin/checkout.c:734
|
||||
msgid "you need to resolve your current index first"
|
||||
msgstr "du måste lösa ditt befintliga index först"
|
||||
|
||||
#: builtin/checkout.c:793
|
||||
#: builtin/checkout.c:788
|
||||
#, c-format
|
||||
msgid ""
|
||||
"cannot continue with staged changes in the following files:\n"
|
||||
|
@ -12196,50 +12199,50 @@ msgstr ""
|
|||
"kan inte fortsätta med köade ändringar i följande filer:\n"
|
||||
"%s"
|
||||
|
||||
#: builtin/checkout.c:886
|
||||
#: builtin/checkout.c:881
|
||||
#, c-format
|
||||
msgid "Can not do reflog for '%s': %s\n"
|
||||
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
|
||||
|
||||
#: builtin/checkout.c:928
|
||||
#: builtin/checkout.c:923
|
||||
msgid "HEAD is now at"
|
||||
msgstr "HEAD är nu på"
|
||||
|
||||
#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
|
||||
#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
|
||||
msgid "unable to update HEAD"
|
||||
msgstr "kan inte uppdatera HEAD"
|
||||
|
||||
#: builtin/checkout.c:936
|
||||
#: builtin/checkout.c:931
|
||||
#, c-format
|
||||
msgid "Reset branch '%s'\n"
|
||||
msgstr "Återställ gren \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:939
|
||||
#: builtin/checkout.c:934
|
||||
#, c-format
|
||||
msgid "Already on '%s'\n"
|
||||
msgstr "Redan på \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:943
|
||||
#: builtin/checkout.c:938
|
||||
#, c-format
|
||||
msgid "Switched to and reset branch '%s'\n"
|
||||
msgstr "Växlade till och nollställde grenen \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:945 builtin/checkout.c:1376
|
||||
#: builtin/checkout.c:940 builtin/checkout.c:1371
|
||||
#, c-format
|
||||
msgid "Switched to a new branch '%s'\n"
|
||||
msgstr "Växlade till en ny gren \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:947
|
||||
#: builtin/checkout.c:942
|
||||
#, c-format
|
||||
msgid "Switched to branch '%s'\n"
|
||||
msgstr "Växlade till grenen \"%s\"\n"
|
||||
|
||||
#: builtin/checkout.c:998
|
||||
#: builtin/checkout.c:993
|
||||
#, c-format
|
||||
msgid " ... and %d more.\n"
|
||||
msgstr " ... och %d till.\n"
|
||||
|
||||
#: builtin/checkout.c:1004
|
||||
#: builtin/checkout.c:999
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Warning: you are leaving %d commit behind, not connected to\n"
|
||||
|
@ -12262,7 +12265,7 @@ msgstr[1] ""
|
|||
"\n"
|
||||
"%s\n"
|
||||
|
||||
#: builtin/checkout.c:1023
|
||||
#: builtin/checkout.c:1018
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to keep it by creating a new branch, this may be a good time\n"
|
||||
|
@ -12289,19 +12292,19 @@ msgstr[1] ""
|
|||
" git branch <nytt_grennamn> %s\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/checkout.c:1058
|
||||
#: builtin/checkout.c:1053
|
||||
msgid "internal error in revision walk"
|
||||
msgstr "internt fel vid genomgång av revisioner (revision walk)"
|
||||
|
||||
#: builtin/checkout.c:1062
|
||||
#: builtin/checkout.c:1057
|
||||
msgid "Previous HEAD position was"
|
||||
msgstr "Tidigare position för HEAD var"
|
||||
|
||||
#: builtin/checkout.c:1102 builtin/checkout.c:1371
|
||||
#: builtin/checkout.c:1097 builtin/checkout.c:1366
|
||||
msgid "You are on a branch yet to be born"
|
||||
msgstr "Du är på en gren som ännu inte är född"
|
||||
|
||||
#: builtin/checkout.c:1184
|
||||
#: builtin/checkout.c:1179
|
||||
#, c-format
|
||||
msgid ""
|
||||
"'%s' could be both a local file and a tracking branch.\n"
|
||||
|
@ -12310,7 +12313,7 @@ msgstr ""
|
|||
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
|
||||
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
|
||||
|
||||
#: builtin/checkout.c:1191
|
||||
#: builtin/checkout.c:1186
|
||||
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"
|
||||
|
@ -12330,51 +12333,51 @@ msgstr ""
|
|||
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
|
||||
"checkout.defaultRemote=origin i din konfiguration."
|
||||
|
||||
#: builtin/checkout.c:1201
|
||||
#: builtin/checkout.c:1196
|
||||
#, c-format
|
||||
msgid "'%s' matched multiple (%d) remote tracking branches"
|
||||
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
|
||||
|
||||
#: builtin/checkout.c:1267
|
||||
#: builtin/checkout.c:1262
|
||||
msgid "only one reference expected"
|
||||
msgstr "endast en referens förväntades"
|
||||
|
||||
#: builtin/checkout.c:1284
|
||||
#: builtin/checkout.c:1279
|
||||
#, c-format
|
||||
msgid "only one reference expected, %d given."
|
||||
msgstr "endast en referens förväntades, %d gavs."
|
||||
|
||||
#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
|
||||
#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
|
||||
#, c-format
|
||||
msgid "invalid reference: %s"
|
||||
msgstr "felaktig referens: %s"
|
||||
|
||||
#: builtin/checkout.c:1343 builtin/checkout.c:1709
|
||||
#: builtin/checkout.c:1338 builtin/checkout.c:1707
|
||||
#, c-format
|
||||
msgid "reference is not a tree: %s"
|
||||
msgstr "referensen är inte ett träd: %s"
|
||||
|
||||
#: builtin/checkout.c:1390
|
||||
#: builtin/checkout.c:1385
|
||||
#, c-format
|
||||
msgid "a branch is expected, got tag '%s'"
|
||||
msgstr "förväntade gren, fick taggen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1392
|
||||
#: builtin/checkout.c:1387
|
||||
#, c-format
|
||||
msgid "a branch is expected, got remote branch '%s'"
|
||||
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1393 builtin/checkout.c:1401
|
||||
#: builtin/checkout.c:1388 builtin/checkout.c:1396
|
||||
#, c-format
|
||||
msgid "a branch is expected, got '%s'"
|
||||
msgstr "förväntade gren, fick \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1396
|
||||
#: builtin/checkout.c:1391
|
||||
#, c-format
|
||||
msgid "a branch is expected, got commit '%s'"
|
||||
msgstr "förväntade gren, fick incheckningen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1412
|
||||
#: builtin/checkout.c:1407
|
||||
msgid ""
|
||||
"cannot switch branch while merging\n"
|
||||
"Consider \"git merge --quit\" or \"git worktree add\"."
|
||||
|
@ -12382,7 +12385,7 @@ msgstr ""
|
|||
"kan inte växla gren vid sammanslagning\n"
|
||||
"Överväg \"git merge --quit\" eller \"git worktree add\"."
|
||||
|
||||
#: builtin/checkout.c:1416
|
||||
#: builtin/checkout.c:1411
|
||||
msgid ""
|
||||
"cannot switch branch in the middle of an am session\n"
|
||||
"Consider \"git am --quit\" or \"git worktree add\"."
|
||||
|
@ -12390,7 +12393,7 @@ msgstr ""
|
|||
"kan inte växla gren mitt i en \"am\"-körning\n"
|
||||
"Överväg \"git am --quit\" eller \"git worktree add\"."
|
||||
|
||||
#: builtin/checkout.c:1420
|
||||
#: builtin/checkout.c:1415
|
||||
msgid ""
|
||||
"cannot switch branch while rebasing\n"
|
||||
"Consider \"git rebase --quit\" or \"git worktree add\"."
|
||||
|
@ -12398,7 +12401,7 @@ msgstr ""
|
|||
"kan inte växla gren vid ombasering\n"
|
||||
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
|
||||
|
||||
#: builtin/checkout.c:1424
|
||||
#: builtin/checkout.c:1419
|
||||
msgid ""
|
||||
"cannot switch branch while cherry-picking\n"
|
||||
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
|
||||
|
@ -12406,7 +12409,7 @@ msgstr ""
|
|||
"kan inte växla gren i en \"cherry-pick\"\n"
|
||||
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
|
||||
|
||||
#: builtin/checkout.c:1428
|
||||
#: builtin/checkout.c:1423
|
||||
msgid ""
|
||||
"cannot switch branch while reverting\n"
|
||||
"Consider \"git revert --quit\" or \"git worktree add\"."
|
||||
|
@ -12414,139 +12417,139 @@ msgstr ""
|
|||
"kan inte växla gren i en \"revert\"\n"
|
||||
"Överväg \"git revert --quit\" eller \"git worktree add\"."
|
||||
|
||||
#: builtin/checkout.c:1432
|
||||
#: builtin/checkout.c:1427
|
||||
msgid "you are switching branch while bisecting"
|
||||
msgstr "då växlar grenar medan du gör en \"bisect\""
|
||||
|
||||
#: builtin/checkout.c:1439
|
||||
#: builtin/checkout.c:1434
|
||||
msgid "paths cannot be used with switching branches"
|
||||
msgstr "sökvägar kan inte användas vid byte av gren"
|
||||
|
||||
#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
|
||||
#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with switching branches"
|
||||
msgstr "\"%s\" kan inte användas vid byte av gren"
|
||||
|
||||
#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
|
||||
#: builtin/checkout.c:1465 builtin/checkout.c:1470
|
||||
#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
|
||||
#: builtin/checkout.c:1460 builtin/checkout.c:1465
|
||||
#, c-format
|
||||
msgid "'%s' cannot be used with '%s'"
|
||||
msgstr "\"%s\" kan inte användas med \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1467
|
||||
#: builtin/checkout.c:1462
|
||||
#, c-format
|
||||
msgid "'%s' cannot take <start-point>"
|
||||
msgstr "\"%s\" kan inte ta <startpunkt>"
|
||||
|
||||
#: builtin/checkout.c:1475
|
||||
#: builtin/checkout.c:1470
|
||||
#, c-format
|
||||
msgid "Cannot switch branch to a non-commit '%s'"
|
||||
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1482
|
||||
#: builtin/checkout.c:1477
|
||||
msgid "missing branch or commit argument"
|
||||
msgstr "saknar gren- eller incheckingsargument"
|
||||
|
||||
#: builtin/checkout.c:1525
|
||||
#: builtin/checkout.c:1520
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "utför en 3-vägssammanslagning för den nya grenen"
|
||||
|
||||
#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
|
||||
#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
|
||||
msgid "style"
|
||||
msgstr "stil"
|
||||
|
||||
#: builtin/checkout.c:1527
|
||||
#: builtin/checkout.c:1522
|
||||
msgid "conflict style (merge or diff3)"
|
||||
msgstr "konfliktstil (merge eller diff3)"
|
||||
|
||||
#: builtin/checkout.c:1539 builtin/worktree.c:488
|
||||
#: builtin/checkout.c:1534 builtin/worktree.c:488
|
||||
msgid "detach HEAD at named commit"
|
||||
msgstr "koppla från HEAD vid namngiven incheckning"
|
||||
|
||||
#: builtin/checkout.c:1540
|
||||
#: builtin/checkout.c:1535
|
||||
msgid "set upstream info for new branch"
|
||||
msgstr "sätt uppströmsinformation för ny gren"
|
||||
|
||||
#: builtin/checkout.c:1542
|
||||
#: builtin/checkout.c:1537
|
||||
msgid "force checkout (throw away local modifications)"
|
||||
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
|
||||
|
||||
#: builtin/checkout.c:1544
|
||||
#: builtin/checkout.c:1539
|
||||
msgid "new-branch"
|
||||
msgstr "ny-gren"
|
||||
|
||||
#: builtin/checkout.c:1544
|
||||
#: builtin/checkout.c:1539
|
||||
msgid "new unparented branch"
|
||||
msgstr "ny gren utan förälder"
|
||||
|
||||
#: builtin/checkout.c:1546 builtin/merge.c:301
|
||||
#: builtin/checkout.c:1541 builtin/merge.c:301
|
||||
msgid "update ignored files (default)"
|
||||
msgstr "uppdatera ignorerade filer (standard)"
|
||||
|
||||
#: builtin/checkout.c:1549
|
||||
#: builtin/checkout.c:1544
|
||||
msgid "do not check if another worktree is holding the given ref"
|
||||
msgstr ""
|
||||
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
|
||||
|
||||
#: builtin/checkout.c:1562
|
||||
#: builtin/checkout.c:1557
|
||||
msgid "checkout our version for unmerged files"
|
||||
msgstr "checka ut vår version för ej sammanslagna filer"
|
||||
|
||||
#: builtin/checkout.c:1565
|
||||
#: builtin/checkout.c:1560
|
||||
msgid "checkout their version for unmerged files"
|
||||
msgstr "checka ut deras version för ej sammanslagna filer"
|
||||
|
||||
#: builtin/checkout.c:1569
|
||||
#: builtin/checkout.c:1564
|
||||
msgid "do not limit pathspecs to sparse entries only"
|
||||
msgstr "begränsa inte sökvägar till endast glesa poster"
|
||||
|
||||
#: builtin/checkout.c:1624
|
||||
#: builtin/checkout.c:1622
|
||||
#, c-format
|
||||
msgid "-%c, -%c and --orphan are mutually exclusive"
|
||||
msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
|
||||
|
||||
#: builtin/checkout.c:1628
|
||||
#: builtin/checkout.c:1626
|
||||
msgid "-p and --overlay are mutually exclusive"
|
||||
msgstr "-p och --overlay är ömsesidigt uteslutande"
|
||||
|
||||
#: builtin/checkout.c:1665
|
||||
#: builtin/checkout.c:1663
|
||||
msgid "--track needs a branch name"
|
||||
msgstr "--track behöver ett namn på en gren"
|
||||
|
||||
#: builtin/checkout.c:1670
|
||||
#: builtin/checkout.c:1668
|
||||
#, c-format
|
||||
msgid "missing branch name; try -%c"
|
||||
msgstr "grennamn saknas; försök med -%c"
|
||||
|
||||
#: builtin/checkout.c:1702
|
||||
#: builtin/checkout.c:1700
|
||||
#, c-format
|
||||
msgid "could not resolve %s"
|
||||
msgstr "kunde inte upplösa %s"
|
||||
|
||||
#: builtin/checkout.c:1718
|
||||
#: builtin/checkout.c:1716
|
||||
msgid "invalid path specification"
|
||||
msgstr "felaktig sökvägsangivelse"
|
||||
|
||||
#: builtin/checkout.c:1725
|
||||
#: builtin/checkout.c:1723
|
||||
#, c-format
|
||||
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
|
||||
msgstr ""
|
||||
"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
|
||||
|
||||
#: builtin/checkout.c:1729
|
||||
#: builtin/checkout.c:1727
|
||||
#, c-format
|
||||
msgid "git checkout: --detach does not take a path argument '%s'"
|
||||
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
|
||||
|
||||
#: builtin/checkout.c:1738
|
||||
#: builtin/checkout.c:1736
|
||||
msgid "--pathspec-from-file is incompatible with --detach"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med --detach"
|
||||
|
||||
#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
|
||||
#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
|
||||
msgid "--pathspec-from-file is incompatible with --patch"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med --patch"
|
||||
|
||||
#: builtin/checkout.c:1754
|
||||
#: builtin/checkout.c:1752
|
||||
msgid ""
|
||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||
"checking out of the index."
|
||||
|
@ -12554,70 +12557,71 @@ msgstr ""
|
|||
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
|
||||
"du checkar ut från indexet."
|
||||
|
||||
#: builtin/checkout.c:1759
|
||||
#: builtin/checkout.c:1757
|
||||
msgid "you must specify path(s) to restore"
|
||||
msgstr "du måste ange katalog(er) att återställa"
|
||||
|
||||
#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
|
||||
#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
|
||||
#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
|
||||
#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
|
||||
#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
|
||||
#: builtin/remote.c:172 builtin/submodule--helper.c:2736
|
||||
#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
|
||||
#: builtin/worktree.c:486
|
||||
msgid "branch"
|
||||
msgstr "gren"
|
||||
|
||||
#: builtin/checkout.c:1786
|
||||
#: builtin/checkout.c:1784
|
||||
msgid "create and checkout a new branch"
|
||||
msgstr "skapa och checka ut en ny gren"
|
||||
|
||||
#: builtin/checkout.c:1788
|
||||
#: builtin/checkout.c:1786
|
||||
msgid "create/reset and checkout a branch"
|
||||
msgstr "skapa/nollställ och checka ut en gren"
|
||||
|
||||
#: builtin/checkout.c:1789
|
||||
#: builtin/checkout.c:1787
|
||||
msgid "create reflog for new branch"
|
||||
msgstr "skapa reflogg för ny gren"
|
||||
|
||||
#: builtin/checkout.c:1791
|
||||
#: builtin/checkout.c:1789
|
||||
msgid "second guess 'git checkout <no-such-branch>' (default)"
|
||||
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
|
||||
|
||||
#: builtin/checkout.c:1792
|
||||
#: builtin/checkout.c:1790
|
||||
msgid "use overlay mode (default)"
|
||||
msgstr "använd överläggsläge (standard)"
|
||||
|
||||
#: builtin/checkout.c:1837
|
||||
#: builtin/checkout.c:1835
|
||||
msgid "create and switch to a new branch"
|
||||
msgstr "skapa och växla till en ny gren"
|
||||
|
||||
#: builtin/checkout.c:1839
|
||||
#: builtin/checkout.c:1837
|
||||
msgid "create/reset and switch to a branch"
|
||||
msgstr "skapa/nollställ och växla till en gren"
|
||||
|
||||
#: builtin/checkout.c:1841
|
||||
#: builtin/checkout.c:1839
|
||||
msgid "second guess 'git switch <no-such-branch>'"
|
||||
msgstr "förutspå \"git checkout <gren-saknas>\""
|
||||
|
||||
#: builtin/checkout.c:1843
|
||||
#: builtin/checkout.c:1841
|
||||
msgid "throw away local modifications"
|
||||
msgstr "kasta bort lokala ändringar"
|
||||
|
||||
#: builtin/checkout.c:1877
|
||||
#: builtin/checkout.c:1875
|
||||
msgid "which tree-ish to checkout from"
|
||||
msgstr "vilken träd-igt att checka ut från"
|
||||
|
||||
#: builtin/checkout.c:1879
|
||||
#: builtin/checkout.c:1877
|
||||
msgid "restore the index"
|
||||
msgstr "återställ indexet"
|
||||
|
||||
#: builtin/checkout.c:1881
|
||||
#: builtin/checkout.c:1879
|
||||
msgid "restore the working tree (default)"
|
||||
msgstr "återställ arbetskatalogen (förval)"
|
||||
|
||||
#: builtin/checkout.c:1883
|
||||
#: builtin/checkout.c:1881
|
||||
msgid "ignore unmerged entries"
|
||||
msgstr "ignorera ej sammanslagna poster"
|
||||
|
||||
#: builtin/checkout.c:1884
|
||||
#: builtin/checkout.c:1882
|
||||
msgid "use overlay mode"
|
||||
msgstr "använd överläggsläge"
|
||||
|
||||
|
@ -12848,13 +12852,13 @@ msgstr "mallkatalog"
|
|||
msgid "directory from which templates will be used"
|
||||
msgstr "katalog att använda mallar från"
|
||||
|
||||
#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
|
||||
#: builtin/submodule--helper.c:2336
|
||||
#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
|
||||
#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
|
||||
msgid "reference repository"
|
||||
msgstr "referensarkiv"
|
||||
|
||||
#: builtin/clone.c:123 builtin/submodule--helper.c:1833
|
||||
#: builtin/submodule--helper.c:2338
|
||||
#: builtin/clone.c:123 builtin/submodule--helper.c:1901
|
||||
#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
|
||||
msgid "use --reference only while cloning"
|
||||
msgstr "använd --reference endast under kloningen"
|
||||
|
||||
|
@ -12903,8 +12907,8 @@ msgstr "revision"
|
|||
msgid "deepen history of shallow clone, excluding rev"
|
||||
msgstr "fördjupa historik för grund klon, exkludera revisionen"
|
||||
|
||||
#: builtin/clone.c:137 builtin/submodule--helper.c:1843
|
||||
#: builtin/submodule--helper.c:2352
|
||||
#: builtin/clone.c:137 builtin/submodule--helper.c:1911
|
||||
#: builtin/submodule--helper.c:2369
|
||||
msgid "clone only one branch, HEAD or --branch"
|
||||
msgstr "klona endast en gren, HEAD eller --branch"
|
||||
|
||||
|
@ -13013,7 +13017,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Klonen lyckades, men utcheckningen misslyckades.\n"
|
||||
"Du kan inspektera det som checkades ut med \"git status\"\n"
|
||||
"och försöka med \"git restore -source=HEAD :/\"\n"
|
||||
"och försöka med \"git restore --source=HEAD :/\"\n"
|
||||
|
||||
#: builtin/clone.c:594
|
||||
#, c-format
|
||||
|
@ -13293,7 +13297,7 @@ 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"
|
||||
msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
|
||||
|
||||
#: builtin/commit-graph.c:287
|
||||
msgid "Collecting commits from input"
|
||||
|
@ -13952,36 +13956,36 @@ msgstr "ok att registrera en tom ändring"
|
|||
msgid "ok to record a change with an empty message"
|
||||
msgstr "ok att registrera en ändring med tomt meddelande"
|
||||
|
||||
#: builtin/commit.c:1747
|
||||
#: builtin/commit.c:1750
|
||||
#, c-format
|
||||
msgid "Corrupt MERGE_HEAD file (%s)"
|
||||
msgstr "Trasig MERGE_HEAD-fil (%s)"
|
||||
|
||||
#: builtin/commit.c:1754
|
||||
#: builtin/commit.c:1757
|
||||
msgid "could not read MERGE_MODE"
|
||||
msgstr "kunde inte läsa MERGE_MODE"
|
||||
|
||||
#: builtin/commit.c:1775
|
||||
#: builtin/commit.c:1778
|
||||
#, c-format
|
||||
msgid "could not read commit message: %s"
|
||||
msgstr "kunde inte läsa incheckningsmeddelande: %s"
|
||||
|
||||
#: builtin/commit.c:1782
|
||||
#: builtin/commit.c:1785
|
||||
#, c-format
|
||||
msgid "Aborting commit due to empty commit message.\n"
|
||||
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
|
||||
|
||||
#: builtin/commit.c:1787
|
||||
#: builtin/commit.c:1790
|
||||
#, c-format
|
||||
msgid "Aborting commit; you did not edit the message.\n"
|
||||
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
|
||||
|
||||
#: builtin/commit.c:1798
|
||||
#: builtin/commit.c:1801
|
||||
#, c-format
|
||||
msgid "Aborting commit due to empty commit message body.\n"
|
||||
msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
|
||||
|
||||
#: builtin/commit.c:1834
|
||||
#: builtin/commit.c:1837
|
||||
msgid ""
|
||||
"repository has been updated, but unable to write\n"
|
||||
"new_index file. Check that disk is not full and quota is\n"
|
||||
|
@ -15344,15 +15348,15 @@ msgstr "visa endast referenser som inte innehåller incheckningen"
|
|||
msgid "git for-each-repo --config=<config> <command-args>"
|
||||
msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
|
||||
|
||||
#: builtin/for-each-repo.c:37
|
||||
#: builtin/for-each-repo.c:34
|
||||
msgid "config"
|
||||
msgstr "konfig"
|
||||
|
||||
#: builtin/for-each-repo.c:38
|
||||
#: builtin/for-each-repo.c:35
|
||||
msgid "config key storing a list of repository paths"
|
||||
msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar"
|
||||
|
||||
#: builtin/for-each-repo.c:46
|
||||
#: builtin/for-each-repo.c:43
|
||||
msgid "missing --config=<config>"
|
||||
msgstr "saknar --config=<konfig>"
|
||||
|
||||
|
@ -16728,7 +16732,7 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\""
|
|||
|
||||
#: builtin/init-db.c:684
|
||||
msgid "--separate-git-dir incompatible with bare repository"
|
||||
msgstr "--separatebgit-dir är inkompatibelt med naket arkiv"
|
||||
msgstr "--separate-git-dir är inkompatibelt med naket arkiv"
|
||||
|
||||
#: builtin/interpret-trailers.c:16
|
||||
msgid ""
|
||||
|
@ -17711,38 +17715,38 @@ msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
|
|||
msgid "'%s' does not point to a commit"
|
||||
msgstr "\"%s\" verkar inte peka på en incheckning"
|
||||
|
||||
#: builtin/merge.c:602
|
||||
#: builtin/merge.c:603
|
||||
#, c-format
|
||||
msgid "Bad branch.%s.mergeoptions string: %s"
|
||||
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
|
||||
|
||||
#: builtin/merge.c:728
|
||||
#: builtin/merge.c:729
|
||||
msgid "Not handling anything other than two heads merge."
|
||||
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
|
||||
|
||||
#: builtin/merge.c:741
|
||||
#: builtin/merge.c:742
|
||||
#, c-format
|
||||
msgid "Unknown option for merge-recursive: -X%s"
|
||||
msgstr "Felaktig flagga för merge-recursive: -X%s"
|
||||
|
||||
#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
|
||||
#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
|
||||
#, c-format
|
||||
msgid "unable to write %s"
|
||||
msgstr "kunde inte skriva %s"
|
||||
|
||||
#: builtin/merge.c:812
|
||||
#: builtin/merge.c:813
|
||||
#, c-format
|
||||
msgid "Could not read from '%s'"
|
||||
msgstr "Kunde inte läsa från \"%s\""
|
||||
|
||||
#: builtin/merge.c:821
|
||||
#: builtin/merge.c:822
|
||||
#, c-format
|
||||
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
||||
msgstr ""
|
||||
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
|
||||
"den.\n"
|
||||
|
||||
#: builtin/merge.c:827
|
||||
#: builtin/merge.c:828
|
||||
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"
|
||||
|
@ -17753,11 +17757,11 @@ msgstr ""
|
|||
"temagren.\n"
|
||||
"\n"
|
||||
|
||||
#: builtin/merge.c:832
|
||||
#: builtin/merge.c:833
|
||||
msgid "An empty message aborts the commit.\n"
|
||||
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
|
||||
|
||||
#: builtin/merge.c:835
|
||||
#: builtin/merge.c:836
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
|
||||
|
@ -17766,73 +17770,73 @@ msgstr ""
|
|||
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
|
||||
"avbryter incheckningen.\n"
|
||||
|
||||
#: builtin/merge.c:888
|
||||
#: builtin/merge.c:889
|
||||
msgid "Empty commit message."
|
||||
msgstr "Tomt incheckningsmeddelande."
|
||||
|
||||
#: builtin/merge.c:903
|
||||
#: builtin/merge.c:904
|
||||
#, c-format
|
||||
msgid "Wonderful.\n"
|
||||
msgstr "Underbart.\n"
|
||||
|
||||
#: builtin/merge.c:964
|
||||
#: builtin/merge.c:965
|
||||
#, c-format
|
||||
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
||||
msgstr ""
|
||||
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
|
||||
|
||||
#: builtin/merge.c:1003
|
||||
#: builtin/merge.c:1004
|
||||
msgid "No current branch."
|
||||
msgstr "Inte på någon gren."
|
||||
|
||||
#: builtin/merge.c:1005
|
||||
#: builtin/merge.c:1006
|
||||
msgid "No remote for the current branch."
|
||||
msgstr "Ingen fjärr för aktuell gren."
|
||||
|
||||
#: builtin/merge.c:1007
|
||||
#: builtin/merge.c:1008
|
||||
msgid "No default upstream defined for the current branch."
|
||||
msgstr "Ingen standarduppström angiven för aktuell gren."
|
||||
|
||||
#: builtin/merge.c:1012
|
||||
#: builtin/merge.c:1013
|
||||
#, c-format
|
||||
msgid "No remote-tracking branch for %s from %s"
|
||||
msgstr "Ingen fjärrspårande gren för %s från %s"
|
||||
|
||||
#: builtin/merge.c:1069
|
||||
#: builtin/merge.c:1070
|
||||
#, c-format
|
||||
msgid "Bad value '%s' in environment '%s'"
|
||||
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
|
||||
|
||||
#: builtin/merge.c:1172
|
||||
#: builtin/merge.c:1173
|
||||
#, c-format
|
||||
msgid "not something we can merge in %s: %s"
|
||||
msgstr "inte något vi kan slå ihop med %s: %s"
|
||||
|
||||
#: builtin/merge.c:1206
|
||||
#: builtin/merge.c:1207
|
||||
msgid "not something we can merge"
|
||||
msgstr "inte något vi kan slå ihop"
|
||||
|
||||
#: builtin/merge.c:1316
|
||||
#: builtin/merge.c:1317
|
||||
msgid "--abort expects no arguments"
|
||||
msgstr "--abort tar inga argument"
|
||||
|
||||
#: builtin/merge.c:1320
|
||||
#: builtin/merge.c:1321
|
||||
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
||||
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
|
||||
|
||||
#: builtin/merge.c:1338
|
||||
#: builtin/merge.c:1339
|
||||
msgid "--quit expects no arguments"
|
||||
msgstr "--quit tar inga argument"
|
||||
|
||||
#: builtin/merge.c:1351
|
||||
#: builtin/merge.c:1352
|
||||
msgid "--continue expects no arguments"
|
||||
msgstr "--continue tar inga argument"
|
||||
|
||||
#: builtin/merge.c:1355
|
||||
#: builtin/merge.c:1356
|
||||
msgid "There is no merge in progress (MERGE_HEAD missing)."
|
||||
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
|
||||
|
||||
#: builtin/merge.c:1371
|
||||
#: builtin/merge.c:1372
|
||||
msgid ""
|
||||
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
||||
"Please, commit your changes before you merge."
|
||||
|
@ -17840,7 +17844,7 @@ msgstr ""
|
|||
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
|
||||
"Checka in dina ändringar innan du slår ihop."
|
||||
|
||||
#: builtin/merge.c:1378
|
||||
#: builtin/merge.c:1379
|
||||
msgid ""
|
||||
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
||||
"Please, commit your changes before you merge."
|
||||
|
@ -17848,88 +17852,88 @@ msgstr ""
|
|||
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
|
||||
"Checka in dina ändringar innan du slår ihop."
|
||||
|
||||
#: builtin/merge.c:1381
|
||||
#: builtin/merge.c:1382
|
||||
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
||||
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
|
||||
|
||||
#: builtin/merge.c:1395
|
||||
#: builtin/merge.c:1396
|
||||
msgid "You cannot combine --squash with --no-ff."
|
||||
msgstr "Du kan inte kombinera --squash med --no-ff."
|
||||
|
||||
#: builtin/merge.c:1397
|
||||
#: builtin/merge.c:1398
|
||||
msgid "You cannot combine --squash with --commit."
|
||||
msgstr "Du kan inte kombinera --squash med --commit."
|
||||
|
||||
#: builtin/merge.c:1413
|
||||
#: builtin/merge.c:1414
|
||||
msgid "No commit specified and merge.defaultToUpstream not set."
|
||||
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
|
||||
|
||||
#: builtin/merge.c:1430
|
||||
#: builtin/merge.c:1431
|
||||
msgid "Squash commit into empty head not supported yet"
|
||||
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
|
||||
|
||||
#: builtin/merge.c:1432
|
||||
#: builtin/merge.c:1433
|
||||
msgid "Non-fast-forward commit does not make sense into an empty head"
|
||||
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
|
||||
|
||||
#: builtin/merge.c:1437
|
||||
#: builtin/merge.c:1438
|
||||
#, c-format
|
||||
msgid "%s - not something we can merge"
|
||||
msgstr "%s - inte något vi kan slå ihop"
|
||||
|
||||
#: builtin/merge.c:1439
|
||||
#: builtin/merge.c:1440
|
||||
msgid "Can merge only exactly one commit into empty head"
|
||||
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
|
||||
|
||||
#: builtin/merge.c:1520
|
||||
#: builtin/merge.c:1521
|
||||
msgid "refusing to merge unrelated histories"
|
||||
msgstr "vägrar slå samman orelaterad historik"
|
||||
|
||||
#: builtin/merge.c:1539
|
||||
#: builtin/merge.c:1540
|
||||
#, c-format
|
||||
msgid "Updating %s..%s\n"
|
||||
msgstr "Uppdaterar %s..%s\n"
|
||||
|
||||
#: builtin/merge.c:1585
|
||||
#: builtin/merge.c:1587
|
||||
#, c-format
|
||||
msgid "Trying really trivial in-index merge...\n"
|
||||
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
|
||||
|
||||
#: builtin/merge.c:1592
|
||||
#: builtin/merge.c:1594
|
||||
#, c-format
|
||||
msgid "Nope.\n"
|
||||
msgstr "Nej.\n"
|
||||
|
||||
#: builtin/merge.c:1623
|
||||
#: builtin/merge.c:1625
|
||||
msgid "Not possible to fast-forward, aborting."
|
||||
msgstr "Kan inte snabbspola, avbryter."
|
||||
|
||||
#: builtin/merge.c:1651 builtin/merge.c:1716
|
||||
#: builtin/merge.c:1653 builtin/merge.c:1719
|
||||
#, c-format
|
||||
msgid "Rewinding the tree to pristine...\n"
|
||||
msgstr "Återspolar trädet till orört...\n"
|
||||
|
||||
#: builtin/merge.c:1655
|
||||
#: builtin/merge.c:1657
|
||||
#, c-format
|
||||
msgid "Trying merge strategy %s...\n"
|
||||
msgstr "Försöker sammanslagningsstrategin %s...\n"
|
||||
|
||||
#: builtin/merge.c:1707
|
||||
#: builtin/merge.c:1709
|
||||
#, c-format
|
||||
msgid "No merge strategy handled the merge.\n"
|
||||
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
|
||||
|
||||
#: builtin/merge.c:1709
|
||||
#: builtin/merge.c:1711
|
||||
#, c-format
|
||||
msgid "Merge with strategy %s failed.\n"
|
||||
msgstr "Sammanslagning med strategin %s misslyckades.\n"
|
||||
|
||||
#: builtin/merge.c:1718
|
||||
#: builtin/merge.c:1721
|
||||
#, c-format
|
||||
msgid "Using the %s to prepare resolving by hand.\n"
|
||||
msgstr "Använder %s för att förbereda lösning för hand.\n"
|
||||
msgid "Using the %s strategy to prepare resolving by hand.\n"
|
||||
msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
|
||||
|
||||
#: builtin/merge.c:1732
|
||||
#: builtin/merge.c:1735
|
||||
#, c-format
|
||||
msgid "Automatic merge went well; stopped before committing as requested\n"
|
||||
msgstr ""
|
||||
|
@ -18979,7 +18983,7 @@ msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
|
|||
|
||||
#: builtin/pack-objects.c:4104
|
||||
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
|
||||
msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
|
||||
msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
|
||||
|
||||
#: builtin/pack-objects.c:4110
|
||||
msgid "cannot use --filter without --stdout"
|
||||
|
@ -20255,7 +20259,7 @@ msgid "fatal: no such branch/commit '%s'"
|
|||
msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
|
||||
|
||||
#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
|
||||
#: builtin/submodule--helper.c:2414
|
||||
#: builtin/submodule--helper.c:2431
|
||||
#, c-format
|
||||
msgid "No such ref: %s"
|
||||
msgstr "Ingen sådan referens: %s"
|
||||
|
@ -21825,7 +21829,7 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]"
|
|||
|
||||
#: builtin/shortlog.c:123
|
||||
msgid "using multiple --group options with stdin is not supported"
|
||||
msgstr "mer än en --group-flagga stöds inte med standard in"
|
||||
msgstr "mer än en --group flagga stöds inte med standard in"
|
||||
|
||||
#: builtin/shortlog.c:133
|
||||
msgid "using --group=trailer with stdin is not supported"
|
||||
|
@ -22106,37 +22110,37 @@ msgstr "misslyckades ändra inställning för sparse-index"
|
|||
msgid "failed to open '%s'"
|
||||
msgstr "misslyckades öppna \"%s\""
|
||||
|
||||
#: builtin/sparse-checkout.c:419
|
||||
#: builtin/sparse-checkout.c:413
|
||||
#, c-format
|
||||
msgid "could not normalize path %s"
|
||||
msgstr "kunde inte normalisera sökvägen \"%s\""
|
||||
|
||||
#: builtin/sparse-checkout.c:431
|
||||
#: builtin/sparse-checkout.c:425
|
||||
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
|
||||
msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
|
||||
|
||||
#: builtin/sparse-checkout.c:456
|
||||
#: builtin/sparse-checkout.c:450
|
||||
#, c-format
|
||||
msgid "unable to unquote C-style string '%s'"
|
||||
msgstr "kan inte ta bort citering av C-sträng \"%s\""
|
||||
|
||||
#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
|
||||
#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
|
||||
msgid "unable to load existing sparse-checkout patterns"
|
||||
msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
|
||||
|
||||
#: builtin/sparse-checkout.c:579
|
||||
#: builtin/sparse-checkout.c:573
|
||||
msgid "read patterns from standard in"
|
||||
msgstr "läs mönster från standard in"
|
||||
|
||||
#: builtin/sparse-checkout.c:594
|
||||
#: builtin/sparse-checkout.c:588
|
||||
msgid "git sparse-checkout reapply"
|
||||
msgstr "git sparse-checkout reapply"
|
||||
|
||||
#: builtin/sparse-checkout.c:613
|
||||
#: builtin/sparse-checkout.c:607
|
||||
msgid "git sparse-checkout disable"
|
||||
msgstr "git sparse-checkout disable"
|
||||
|
||||
#: builtin/sparse-checkout.c:644
|
||||
#: builtin/sparse-checkout.c:638
|
||||
msgid "error while refreshing working directory"
|
||||
msgstr "fel vid uppdatering av arbetskatalog"
|
||||
|
||||
|
@ -22419,7 +22423,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:46 builtin/submodule--helper.c:2423
|
||||
#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
|
||||
#, c-format
|
||||
msgid "Expecting a full ref name, got %s"
|
||||
msgstr "Förväntade fullt referensnamn, fick %s"
|
||||
|
@ -22433,26 +22437,27 @@ 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:409 builtin/submodule--helper.c:1819
|
||||
#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
|
||||
#: builtin/submodule--helper.c:2891
|
||||
msgid "alternative anchor for relative paths"
|
||||
msgstr "alternativa ankare för relativa sökvägar"
|
||||
|
||||
#: builtin/submodule--helper.c:414
|
||||
#: builtin/submodule--helper.c:416
|
||||
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:629
|
||||
#: builtin/submodule--helper.c:652
|
||||
#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
|
||||
#: builtin/submodule--helper.c:654
|
||||
#, c-format
|
||||
msgid "No url found for submodule path '%s' in .gitmodules"
|
||||
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
|
||||
|
||||
#: builtin/submodule--helper.c:524
|
||||
#: builtin/submodule--helper.c:526
|
||||
#, c-format
|
||||
msgid "Entering '%s'\n"
|
||||
msgstr "Går in i \"%s\"\n"
|
||||
|
||||
#: builtin/submodule--helper.c:527
|
||||
#: builtin/submodule--helper.c:529
|
||||
#, c-format
|
||||
msgid ""
|
||||
"run_command returned non-zero status for %s\n"
|
||||
|
@ -22461,7 +22466,7 @@ msgstr ""
|
|||
"run_command returnerade icke-nollstatus för %s\n"
|
||||
"."
|
||||
|
||||
#: builtin/submodule--helper.c:549
|
||||
#: builtin/submodule--helper.c:551
|
||||
#, c-format
|
||||
msgid ""
|
||||
"run_command returned non-zero status while recursing in the nested "
|
||||
|
@ -22472,20 +22477,20 @@ msgstr ""
|
|||
"undermoduler för %s\n"
|
||||
"."
|
||||
|
||||
#: builtin/submodule--helper.c:565
|
||||
#: builtin/submodule--helper.c:567
|
||||
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:888
|
||||
#: builtin/submodule--helper.c:1487
|
||||
#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
|
||||
#: builtin/submodule--helper.c:1489
|
||||
msgid "recurse into nested submodules"
|
||||
msgstr "rekursera in i nästlade undermoduler"
|
||||
|
||||
#: builtin/submodule--helper.c:572
|
||||
#: builtin/submodule--helper.c:574
|
||||
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
|
||||
msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
|
||||
|
||||
#: builtin/submodule--helper.c:599
|
||||
#: builtin/submodule--helper.c:601
|
||||
#, c-format
|
||||
msgid ""
|
||||
"could not look up configuration '%s'. Assuming this repository is its own "
|
||||
|
@ -22494,54 +22499,54 @@ msgstr ""
|
|||
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
|
||||
"officiella uppström."
|
||||
|
||||
#: builtin/submodule--helper.c:666
|
||||
#: builtin/submodule--helper.c:668
|
||||
#, 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:670
|
||||
#: builtin/submodule--helper.c:672
|
||||
#, 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:680
|
||||
#: builtin/submodule--helper.c:682
|
||||
#, 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:687
|
||||
#: builtin/submodule--helper.c:689
|
||||
#, 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:709
|
||||
#: builtin/submodule--helper.c:711
|
||||
msgid "suppress output for initializing a submodule"
|
||||
msgstr "dölj utdata från initiering av undermodul"
|
||||
|
||||
#: builtin/submodule--helper.c:714
|
||||
#: builtin/submodule--helper.c:716
|
||||
msgid "git submodule--helper init [<options>] [<path>]"
|
||||
msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
|
||||
|
||||
#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
|
||||
#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
|
||||
#, 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:835
|
||||
#: builtin/submodule--helper.c:837
|
||||
#, 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:862 builtin/submodule--helper.c:1457
|
||||
#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
|
||||
#, c-format
|
||||
msgid "failed to recurse into submodule '%s'"
|
||||
msgstr "misslyckades rekursera in i undermodulen \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
|
||||
#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
|
||||
msgid "suppress submodule status output"
|
||||
msgstr "hindra statusutskrift för undermodul"
|
||||
|
||||
#: builtin/submodule--helper.c:887
|
||||
#: builtin/submodule--helper.c:889
|
||||
msgid ""
|
||||
"use commit stored in the index instead of the one stored in the submodule "
|
||||
"HEAD"
|
||||
|
@ -22549,98 +22554,98 @@ msgstr ""
|
|||
"visa incheckning från indexet istället för den som lagrats i undermodulens "
|
||||
"HEAD"
|
||||
|
||||
#: builtin/submodule--helper.c:893
|
||||
#: builtin/submodule--helper.c:895
|
||||
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
|
||||
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
|
||||
|
||||
#: builtin/submodule--helper.c:917
|
||||
#: builtin/submodule--helper.c:919
|
||||
msgid "git submodule--helper name <path>"
|
||||
msgstr "git submodule--helper name <sökväg>"
|
||||
|
||||
#: builtin/submodule--helper.c:989
|
||||
#: builtin/submodule--helper.c:991
|
||||
#, c-format
|
||||
msgid "* %s %s(blob)->%s(submodule)"
|
||||
msgstr "* %s %s(blob)->%s(submodule)"
|
||||
|
||||
#: builtin/submodule--helper.c:992
|
||||
#: builtin/submodule--helper.c:994
|
||||
#, c-format
|
||||
msgid "* %s %s(submodule)->%s(blob)"
|
||||
msgstr "* %s %s(submodule)->%s(blob)"
|
||||
|
||||
#: builtin/submodule--helper.c:1005
|
||||
#: builtin/submodule--helper.c:1007
|
||||
#, c-format
|
||||
msgid "%s"
|
||||
msgstr "%s"
|
||||
|
||||
#: builtin/submodule--helper.c:1055
|
||||
#: builtin/submodule--helper.c:1057
|
||||
#, c-format
|
||||
msgid "couldn't hash object from '%s'"
|
||||
msgstr "kunde inte hasha objekt från \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:1059
|
||||
#: builtin/submodule--helper.c:1061
|
||||
#, c-format
|
||||
msgid "unexpected mode %o\n"
|
||||
msgstr "okänt läge %o\n"
|
||||
|
||||
#: builtin/submodule--helper.c:1300
|
||||
#: builtin/submodule--helper.c:1302
|
||||
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
|
||||
#: builtin/submodule--helper.c:1304
|
||||
msgid "compare the commit in the index with that in the submodule HEAD"
|
||||
msgstr "jämför incheckningen i indexet med den i undermodulens HEAD"
|
||||
|
||||
#: builtin/submodule--helper.c:1304
|
||||
#: builtin/submodule--helper.c:1306
|
||||
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
|
||||
#: builtin/submodule--helper.c:1308
|
||||
msgid "limit the summary size"
|
||||
msgstr "begränsa översiktsstorleken"
|
||||
|
||||
#: builtin/submodule--helper.c:1311
|
||||
#: builtin/submodule--helper.c:1313
|
||||
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
|
||||
msgstr ""
|
||||
"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
|
||||
|
||||
#: builtin/submodule--helper.c:1335
|
||||
#: builtin/submodule--helper.c:1337
|
||||
msgid "could not fetch a revision for HEAD"
|
||||
msgstr "kunde inte hämta en version för HEAD"
|
||||
|
||||
#: builtin/submodule--helper.c:1340
|
||||
#: builtin/submodule--helper.c:1342
|
||||
msgid "--cached and --files are mutually exclusive"
|
||||
msgstr "--cached och --files är ömsesidigt uteslutande"
|
||||
|
||||
#: builtin/submodule--helper.c:1407
|
||||
#: builtin/submodule--helper.c:1409
|
||||
#, c-format
|
||||
msgid "Synchronizing submodule url for '%s'\n"
|
||||
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
|
||||
|
||||
#: builtin/submodule--helper.c:1413
|
||||
#: builtin/submodule--helper.c:1415
|
||||
#, 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:1427
|
||||
#: builtin/submodule--helper.c:1429
|
||||
#, 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:1438
|
||||
#: builtin/submodule--helper.c:1440
|
||||
#, 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:1485
|
||||
#: builtin/submodule--helper.c:1487
|
||||
msgid "suppress output of synchronizing submodule url"
|
||||
msgstr "dölj utdata från synkronisering av undermodul-url"
|
||||
|
||||
#: builtin/submodule--helper.c:1492
|
||||
#: builtin/submodule--helper.c:1494
|
||||
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
|
||||
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
|
||||
|
||||
#: builtin/submodule--helper.c:1546
|
||||
#: builtin/submodule--helper.c:1548
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
|
||||
|
@ -22649,7 +22654,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:1558
|
||||
#: builtin/submodule--helper.c:1560
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
|
||||
|
@ -22658,46 +22663,46 @@ msgstr ""
|
|||
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
|
||||
"dem"
|
||||
|
||||
#: builtin/submodule--helper.c:1566
|
||||
#: builtin/submodule--helper.c:1568
|
||||
#, c-format
|
||||
msgid "Cleared directory '%s'\n"
|
||||
msgstr "Rensade katalogen \"%s\"\n"
|
||||
|
||||
#: builtin/submodule--helper.c:1568
|
||||
#: builtin/submodule--helper.c:1570
|
||||
#, c-format
|
||||
msgid "Could not remove submodule work tree '%s'\n"
|
||||
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
|
||||
|
||||
#: builtin/submodule--helper.c:1579
|
||||
#: builtin/submodule--helper.c:1581
|
||||
#, c-format
|
||||
msgid "could not create empty submodule directory %s"
|
||||
msgstr "kunde inte skapa tom undermodulskatalog %s"
|
||||
|
||||
#: builtin/submodule--helper.c:1595
|
||||
#: builtin/submodule--helper.c:1597
|
||||
#, 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:1624
|
||||
#: builtin/submodule--helper.c:1626
|
||||
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:1625
|
||||
#: builtin/submodule--helper.c:1627
|
||||
msgid "unregister all submodules"
|
||||
msgstr "avregistrera alla undermoduler"
|
||||
|
||||
#: builtin/submodule--helper.c:1630
|
||||
#: builtin/submodule--helper.c:1632
|
||||
msgid ""
|
||||
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
|
||||
msgstr ""
|
||||
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
|
||||
|
||||
#: builtin/submodule--helper.c:1644
|
||||
#: builtin/submodule--helper.c:1646
|
||||
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:1713
|
||||
#: builtin/submodule--helper.c:1690
|
||||
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"
|
||||
|
@ -22709,46 +22714,67 @@ msgstr ""
|
|||
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
|
||||
"med \"--reference-if-able\" istället för \"--reference\"."
|
||||
|
||||
#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
|
||||
#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
|
||||
#, c-format
|
||||
msgid "submodule '%s' cannot add alternate: %s"
|
||||
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
|
||||
|
||||
#: builtin/submodule--helper.c:1791
|
||||
#: builtin/submodule--helper.c:1768
|
||||
#, 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:1798
|
||||
#: builtin/submodule--helper.c:1775
|
||||
#, 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:1822
|
||||
#: builtin/submodule--helper.c:1800
|
||||
#, 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:1841
|
||||
#, c-format
|
||||
msgid "clone of '%s' into submodule path '%s' failed"
|
||||
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:1846
|
||||
#, c-format
|
||||
msgid "directory not empty: '%s'"
|
||||
msgstr "katalogen inte tom: \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:1858
|
||||
#, c-format
|
||||
msgid "could not get submodule directory for '%s'"
|
||||
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
|
||||
msgid "where the new submodule will be cloned to"
|
||||
msgstr "var den nya undermodulen ska klonas till"
|
||||
|
||||
#: builtin/submodule--helper.c:1825
|
||||
#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
|
||||
msgid "name of the new submodule"
|
||||
msgstr "namn på den nya undermodulen"
|
||||
|
||||
#: builtin/submodule--helper.c:1828
|
||||
#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
|
||||
msgid "url where to clone the submodule from"
|
||||
msgstr "URL att klona undermodulen från"
|
||||
|
||||
#: builtin/submodule--helper.c:1836
|
||||
#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
|
||||
msgid "depth for shallow clones"
|
||||
msgstr "djup för grunda kloner"
|
||||
|
||||
#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
|
||||
#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
|
||||
#: builtin/submodule--helper.c:2909
|
||||
msgid "force cloning progress"
|
||||
msgstr "tvinga kloningsförlopp"
|
||||
|
||||
#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
|
||||
#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
|
||||
msgid "disallow cloning into non-empty directory"
|
||||
msgstr "förhindra kloning till icke-tom katalog"
|
||||
|
||||
#: builtin/submodule--helper.c:1848
|
||||
#: builtin/submodule--helper.c:1916
|
||||
msgid ""
|
||||
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
||||
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
|
||||
|
@ -22758,103 +22784,83 @@ msgstr ""
|
|||
"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
|
||||
"path <sökväg>"
|
||||
|
||||
#: 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: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:1888
|
||||
#, c-format
|
||||
msgid "directory not empty: '%s'"
|
||||
msgstr "katalogen inte tom: \"%s\""
|
||||
|
||||
#: 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:1936
|
||||
#: builtin/submodule--helper.c:1953
|
||||
#, 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:1940
|
||||
#: builtin/submodule--helper.c:1957
|
||||
#, 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:2041
|
||||
#: builtin/submodule--helper.c:2058
|
||||
#, c-format
|
||||
msgid "Submodule path '%s' not initialized"
|
||||
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
|
||||
|
||||
#: builtin/submodule--helper.c:2045
|
||||
#: builtin/submodule--helper.c:2062
|
||||
msgid "Maybe you want to use 'update --init'?"
|
||||
msgstr "Kanske menade du att använda \"update --init\"?"
|
||||
|
||||
#: builtin/submodule--helper.c:2075
|
||||
#: builtin/submodule--helper.c:2092
|
||||
#, c-format
|
||||
msgid "Skipping unmerged submodule %s"
|
||||
msgstr "Hoppar över ej sammanslagen undermodul %s"
|
||||
|
||||
#: builtin/submodule--helper.c:2104
|
||||
#: builtin/submodule--helper.c:2121
|
||||
#, c-format
|
||||
msgid "Skipping submodule '%s'"
|
||||
msgstr "Hoppar över undermodulen \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:2254
|
||||
#: builtin/submodule--helper.c:2271
|
||||
#, c-format
|
||||
msgid "Failed to clone '%s'. Retry scheduled"
|
||||
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
|
||||
|
||||
#: builtin/submodule--helper.c:2265
|
||||
#: builtin/submodule--helper.c:2282
|
||||
#, 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:2327 builtin/submodule--helper.c:2573
|
||||
#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
|
||||
msgid "path into the working tree"
|
||||
msgstr "sökväg inuti arbetskatalogen"
|
||||
|
||||
#: builtin/submodule--helper.c:2330
|
||||
#: builtin/submodule--helper.c:2347
|
||||
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:2334
|
||||
#: builtin/submodule--helper.c:2351
|
||||
msgid "rebase, merge, checkout or none"
|
||||
msgstr "rebase, merge, checkout eller none"
|
||||
|
||||
#: builtin/submodule--helper.c:2340
|
||||
#: builtin/submodule--helper.c:2357
|
||||
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:2343
|
||||
#: builtin/submodule--helper.c:2360
|
||||
msgid "parallel jobs"
|
||||
msgstr "parallella jobb"
|
||||
|
||||
#: builtin/submodule--helper.c:2345
|
||||
#: builtin/submodule--helper.c:2362
|
||||
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:2346
|
||||
#: builtin/submodule--helper.c:2363
|
||||
msgid "don't print cloning progress"
|
||||
msgstr "skriv inte klonförlopp"
|
||||
|
||||
#: builtin/submodule--helper.c:2357
|
||||
#: builtin/submodule--helper.c:2374
|
||||
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:2370
|
||||
#: builtin/submodule--helper.c:2387
|
||||
msgid "bad value for update parameter"
|
||||
msgstr "felaktigt värde för parametern update"
|
||||
|
||||
#: builtin/submodule--helper.c:2418
|
||||
#: builtin/submodule--helper.c:2435
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
||||
|
@ -22863,84 +22869,143 @@ 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:2541
|
||||
#: builtin/submodule--helper.c:2558
|
||||
#, 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:2574
|
||||
#: builtin/submodule--helper.c:2591
|
||||
msgid "recurse into submodules"
|
||||
msgstr "rekursera ner i undermoduler"
|
||||
|
||||
#: builtin/submodule--helper.c:2580
|
||||
#: builtin/submodule--helper.c:2597
|
||||
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
|
||||
msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
|
||||
|
||||
#: builtin/submodule--helper.c:2636
|
||||
#: builtin/submodule--helper.c:2653
|
||||
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:2639
|
||||
#: builtin/submodule--helper.c:2656
|
||||
msgid "unset the config in the .gitmodules file"
|
||||
msgstr "ta bort konfigurationen från .gitmodules-filen"
|
||||
|
||||
#: builtin/submodule--helper.c:2644
|
||||
#: builtin/submodule--helper.c:2661
|
||||
msgid "git submodule--helper config <name> [<value>]"
|
||||
msgstr "git submodule--helper config <namn> [<värde>]"
|
||||
|
||||
#: builtin/submodule--helper.c:2645
|
||||
#: builtin/submodule--helper.c:2662
|
||||
msgid "git submodule--helper config --unset <name>"
|
||||
msgstr "git submodule--helper config --unset <namn>"
|
||||
|
||||
#: builtin/submodule--helper.c:2646
|
||||
#: builtin/submodule--helper.c:2663
|
||||
msgid "git submodule--helper config --check-writeable"
|
||||
msgstr "git submodule--helper config --check-writeable"
|
||||
|
||||
#: builtin/submodule--helper.c:2665 git-submodule.sh:150
|
||||
#: builtin/submodule--helper.c:2682 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:2681
|
||||
#: builtin/submodule--helper.c:2698
|
||||
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:2685
|
||||
#: builtin/submodule--helper.c:2702
|
||||
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
|
||||
msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
|
||||
|
||||
#: builtin/submodule--helper.c:2718
|
||||
#: builtin/submodule--helper.c:2735
|
||||
msgid "set the default tracking branch to master"
|
||||
msgstr "välj master som förvald spårad gren"
|
||||
|
||||
#: builtin/submodule--helper.c:2720
|
||||
#: builtin/submodule--helper.c:2737
|
||||
msgid "set the default tracking branch"
|
||||
msgstr "välj förvald spårad gren"
|
||||
|
||||
#: builtin/submodule--helper.c:2724
|
||||
#: builtin/submodule--helper.c:2741
|
||||
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:2725
|
||||
#: builtin/submodule--helper.c:2742
|
||||
msgid ""
|
||||
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
|
||||
msgstr ""
|
||||
"git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>"
|
||||
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
|
||||
|
||||
#: builtin/submodule--helper.c:2732
|
||||
#: builtin/submodule--helper.c:2749
|
||||
msgid "--branch or --default required"
|
||||
msgstr "--branch eller --default krävs"
|
||||
|
||||
#: builtin/submodule--helper.c:2735
|
||||
#: builtin/submodule--helper.c:2752
|
||||
msgid "--branch and --default are mutually exclusive"
|
||||
msgstr "--branch och --default är ömsesidigt uteslutande"
|
||||
|
||||
#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
|
||||
#: builtin/submodule--helper.c:2815
|
||||
#, c-format
|
||||
msgid "Adding existing repo at '%s' to the index\n"
|
||||
msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
|
||||
|
||||
#: builtin/submodule--helper.c:2818
|
||||
#, c-format
|
||||
msgid "'%s' already exists and is not a valid git repo"
|
||||
msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
|
||||
|
||||
#: builtin/submodule--helper.c:2828
|
||||
#, c-format
|
||||
msgid "A git directory for '%s' is found locally with remote(s):"
|
||||
msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):"
|
||||
|
||||
#: builtin/submodule--helper.c:2833
|
||||
#, c-format
|
||||
msgid ""
|
||||
"If you want to reuse this local git directory instead of cloning again from\n"
|
||||
" %s\n"
|
||||
"use the '--force' option. If the local git directory is not the correct "
|
||||
"repo\n"
|
||||
"or if you are unsure what this means, choose another name with the '--name' "
|
||||
"option.\n"
|
||||
msgstr ""
|
||||
"Om du vill återanvända den lokala git-katalogen istället för att klona på "
|
||||
"nytt från\n"
|
||||
" %s\n"
|
||||
"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
|
||||
"korrekt\n"
|
||||
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
|
||||
"flaggan \"--name\".\n"
|
||||
|
||||
#: builtin/submodule--helper.c:2842
|
||||
#, c-format
|
||||
msgid "Reactivating local git directory for submodule '%s'\n"
|
||||
msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
|
||||
|
||||
#: builtin/submodule--helper.c:2875
|
||||
#, c-format
|
||||
msgid "unable to checkout submodule '%s'"
|
||||
msgstr "Kan inte checka ut undermodulen \"%s\""
|
||||
|
||||
#: builtin/submodule--helper.c:2888
|
||||
msgid "branch of repository to checkout on cloning"
|
||||
msgstr "gren från arkivet att checka ut vid kloning"
|
||||
|
||||
#: builtin/submodule--helper.c:2910
|
||||
msgid "allow adding an otherwise ignored submodule path"
|
||||
msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
|
||||
|
||||
#: builtin/submodule--helper.c:2917
|
||||
msgid ""
|
||||
"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
|
||||
"name <name>"
|
||||
msgstr ""
|
||||
"git submodule--helper add-clone [<flaggor>...] --url <url> --path <sökväg> "
|
||||
"--name <namn>"
|
||||
|
||||
#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
|
||||
#, c-format
|
||||
msgid "%s doesn't support --super-prefix"
|
||||
msgstr "%s stöder inte --super-prefix"
|
||||
|
||||
#: builtin/submodule--helper.c:2798
|
||||
#: builtin/submodule--helper.c:2991
|
||||
#, c-format
|
||||
msgid "'%s' is not a valid submodule--helper subcommand"
|
||||
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
|
||||
|
@ -23530,7 +23595,7 @@ msgstr "visa endast statistik"
|
|||
|
||||
#: builtin/verify-tag.c:18
|
||||
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
|
||||
msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
|
||||
msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..."
|
||||
|
||||
#: builtin/verify-tag.c:36
|
||||
msgid "print tag contents"
|
||||
|
@ -25146,70 +25211,27 @@ msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
|
|||
msgid "'$sm_path' does not have a commit checked out"
|
||||
msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
|
||||
|
||||
#: git-submodule.sh:249
|
||||
#, sh-format
|
||||
msgid "Adding existing repo at '$sm_path' to the index"
|
||||
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
|
||||
|
||||
#: git-submodule.sh:251
|
||||
#, sh-format
|
||||
msgid "'$sm_path' already exists and is not a valid git repo"
|
||||
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
|
||||
|
||||
#: git-submodule.sh:259
|
||||
#, sh-format
|
||||
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
||||
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
|
||||
|
||||
#: git-submodule.sh:261
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"If you want to reuse this local git directory instead of cloning again from\n"
|
||||
" $realrepo\n"
|
||||
"use the '--force' option. If the local git directory is not the correct "
|
||||
"repo\n"
|
||||
"or you are unsure what this means choose another name with the '--name' "
|
||||
"option."
|
||||
msgstr ""
|
||||
"Om du vill återanvända den lokala git-katalogen instället för att klona på "
|
||||
"nytt från\n"
|
||||
" $realrepo\n"
|
||||
"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
|
||||
"korrekt\n"
|
||||
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
|
||||
"flaggan \"--name\"."
|
||||
|
||||
#: git-submodule.sh:267
|
||||
#, sh-format
|
||||
msgid "Reactivating local git directory for submodule '$sm_name'."
|
||||
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
|
||||
|
||||
#: git-submodule.sh:279
|
||||
#, sh-format
|
||||
msgid "Unable to checkout submodule '$sm_path'"
|
||||
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
|
||||
|
||||
#: git-submodule.sh:284
|
||||
#: git-submodule.sh:248
|
||||
#, sh-format
|
||||
msgid "Failed to add submodule '$sm_path'"
|
||||
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
|
||||
|
||||
#: git-submodule.sh:293
|
||||
#: git-submodule.sh:257
|
||||
#, sh-format
|
||||
msgid "Failed to register submodule '$sm_path'"
|
||||
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
|
||||
|
||||
#: git-submodule.sh:568
|
||||
#: git-submodule.sh:532
|
||||
#, sh-format
|
||||
msgid "Unable to find current revision in submodule path '$displaypath'"
|
||||
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
|
||||
|
||||
#: git-submodule.sh:578
|
||||
#: git-submodule.sh:542
|
||||
#, sh-format
|
||||
msgid "Unable to fetch in submodule path '$sm_path'"
|
||||
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
|
||||
|
||||
#: git-submodule.sh:583
|
||||
#: git-submodule.sh:547
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
||||
|
@ -25218,7 +25240,7 @@ msgstr ""
|
|||
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
|
||||
"undermodulsökvägen \"$sm_path\""
|
||||
|
||||
#: git-submodule.sh:601
|
||||
#: git-submodule.sh:565
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
|
||||
|
@ -25227,7 +25249,7 @@ msgstr ""
|
|||
"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
|
||||
"direkt:"
|
||||
|
||||
#: git-submodule.sh:607
|
||||
#: git-submodule.sh:571
|
||||
#, sh-format
|
||||
msgid ""
|
||||
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
||||
|
@ -25236,48 +25258,48 @@ msgstr ""
|
|||
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
|
||||
"Direkt hämtning av incheckningen misslyckades."
|
||||
|
||||
#: git-submodule.sh:614
|
||||
#: git-submodule.sh:578
|
||||
#, sh-format
|
||||
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
||||
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
||||
|
||||
#: git-submodule.sh:615
|
||||
#: git-submodule.sh:579
|
||||
#, sh-format
|
||||
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
||||
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
|
||||
|
||||
#: git-submodule.sh:619
|
||||
#: git-submodule.sh:583
|
||||
#, sh-format
|
||||
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
||||
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
||||
|
||||
#: git-submodule.sh:620
|
||||
#: git-submodule.sh:584
|
||||
#, sh-format
|
||||
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
||||
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
|
||||
|
||||
#: git-submodule.sh:625
|
||||
#: git-submodule.sh:589
|
||||
#, sh-format
|
||||
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
||||
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
||||
|
||||
#: git-submodule.sh:626
|
||||
#: git-submodule.sh:590
|
||||
#, sh-format
|
||||
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
||||
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
|
||||
|
||||
#: git-submodule.sh:631
|
||||
#: git-submodule.sh:595
|
||||
#, sh-format
|
||||
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
||||
msgstr ""
|
||||
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
|
||||
|
||||
#: git-submodule.sh:632
|
||||
#: git-submodule.sh:596
|
||||
#, sh-format
|
||||
msgid "Submodule path '$displaypath': '$command $sha1'"
|
||||
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
|
||||
|
||||
#: git-submodule.sh:663
|
||||
#: git-submodule.sh:627
|
||||
#, sh-format
|
||||
msgid "Failed to recurse into submodule path '$displaypath'"
|
||||
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
|
||||
|
@ -26028,7 +26050,7 @@ msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
|
|||
|
||||
#: git-send-email.perl:450
|
||||
msgid "--dump-aliases incompatible with other options\n"
|
||||
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
|
||||
msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
|
||||
|
||||
#: git-send-email.perl:525
|
||||
msgid ""
|
||||
|
|
Loading…
Reference in New Issue