@matheusbsbs / matheus-bagliano / commits / efedbb11de

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>

Peter Krefting committed Aug 14, 2021 at 21:15 UTC efedbb11de27a22cf9d4c75255057716f0b1b8ce
1 file changed +530 -508
po/sv.po
+530 -508
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 2.33.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2021-08-03 17:06+0800\n"
11 -"PO-Revision-Date: 2021-08-09 20:35+0100\n"
10 +"POT-Creation-Date: 2021-08-14 07:56+0800\n"
11 +"PO-Revision-Date: 2021-08-14 21:14+0100\n"
12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
14 "Language: sv\n"
@@ -23,7 +23,7 @@ msgstr ""
23 msgid "Huh (%s)?"
24 msgstr "Vadå (%s)?"
25
26 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
27 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
28 #: builtin/rebase.c:1953
29 msgid "could not read index"
@@ -53,7 +53,7 @@ msgstr "Uppdatera"
53 msgid "could not stage '%s'"
54 msgstr "kunde inte köa \"%s\""
55
56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
57 msgid "could not write index"
58 msgstr "kunde inte skriva indexet"
59
@@ -212,9 +212,10 @@ msgstr "ej köad"
212 #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
213 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
214 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
215 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
216 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
217 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
215 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
216 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
217 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
218 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
219 #: git-add--interactive.perl:213
220 msgid "path"
221 msgstr "sökväg"
@@ -797,7 +798,7 @@ msgstr ""
798 msgid "Exiting because of an unresolved conflict."
799 msgstr "Avslutar på grund av olöst konflikgt."
800
800 -#: advice.c:283 builtin/merge.c:1374
801 +#: advice.c:283 builtin/merge.c:1375
802 msgid "You have not concluded your merge (MERGE_HEAD exists)."
803 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
804
@@ -1571,7 +1572,7 @@ msgstr "kan inte läsa %s"
1572
1573 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1574 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1574 -#: builtin/merge.c:1143
1575 +#: builtin/merge.c:1144
1576 #, c-format
1577 msgid "could not read '%s'"
1578 msgstr "kunde inte läsa \"%s\""
@@ -1660,7 +1661,8 @@ msgid "list supported archive formats"
1661 msgstr "visa understödda arkivformat"
1662
1663 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1663 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1664 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1665 +#: builtin/submodule--helper.c:2902
1666 msgid "repo"
1667 msgstr "arkiv"
1668
@@ -1855,7 +1857,7 @@ msgstr ""
1857 "--reverse och --first-parent tillsammans kräver att du anger senaste "
1858 "incheckningen"
1859
1858 -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
1860 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1861 #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1862 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1863 #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
@@ -3118,7 +3120,7 @@ msgstr "oväntad filtertyp"
3120 msgid "path name too long for external filter"
3121 msgstr "sökvägen för lång för externt filter"
3122
3121 -#: convert.c:934
3123 +#: convert.c:935
3124 #, c-format
3125 msgid ""
3126 "external filter '%s' is not available anymore although not all paths have "
@@ -3127,16 +3129,16 @@ msgstr ""
3129 "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
3130 "inte har filtrerats"
3131
3130 -#: convert.c:1234
3132 +#: convert.c:1236
3133 msgid "true/false are no valid working-tree-encodings"
3134 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
3135
3134 -#: convert.c:1414 convert.c:1447
3136 +#: convert.c:1416 convert.c:1449
3137 #, c-format
3138 msgid "%s: clean filter '%s' failed"
3139 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
3140
3139 -#: convert.c:1490
3141 +#: convert.c:1492
3142 #, c-format
3143 msgid "%s: smudge filter %s failed"
3144 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
@@ -3314,7 +3316,7 @@ msgid ""
3316 "'dimmed-zebra', 'plain'"
3317 msgstr ""
3318 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "
3317 -"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
3319 +"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
3320
3321 #: diff.c:325
3322 #, c-format
@@ -3355,7 +3357,7 @@ msgstr "extern diff dog, stannar vid %s"
3357
3358 #: diff.c:4634
3359 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3358 -msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
3360 +msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
3361
3362 #: diff.c:4637
3363 msgid "-G, -S and --find-object are mutually exclusive"
@@ -3370,10 +3372,10 @@ msgstr ""
3372
3373 #: diff.c:4643
3374 msgid ""
3373 -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3375 +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3376 "with -G and -S"
3377 msgstr ""
3376 -"---pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
3378 +"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
3379 "all med -G och -S"
3380
3381 #: diff.c:4722
@@ -3929,7 +3931,7 @@ msgstr ""
3931 msgid "failed to read orderfile '%s'"
3932 msgstr "kunde inte läsa orderfilen \"%s\""
3933
3932 -#: diffcore-rename.c:1510
3934 +#: diffcore-rename.c:1514
3935 msgid "Performing inexact rename detection"
3936 msgstr "Utför onöjaktig namnbytesdetektering"
3937
@@ -3948,51 +3950,51 @@ msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
3950 msgid "unrecognized pattern: '%s'"
3951 msgstr "okänt mönster: %s"
3952
3951 -#: dir.c:792 dir.c:806
3953 +#: dir.c:790 dir.c:804
3954 #, c-format
3955 msgid "unrecognized negative pattern: '%s'"
3956 msgstr "okänt negativt mönster: %s"
3957
3956 -#: dir.c:824
3958 +#: dir.c:820
3959 #, c-format
3960 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3961 msgstr ""
3962 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
3963 "gånger"
3964
3963 -#: dir.c:834
3965 +#: dir.c:830
3966 msgid "disabling cone pattern matching"
3967 msgstr "inaktiverar konmönstermatchning"
3968
3967 -#: dir.c:1221
3969 +#: dir.c:1214
3970 #, c-format
3971 msgid "cannot use %s as an exclude file"
3972 msgstr "kan inte använda %s som exkluderingsfil"
3973
3972 -#: dir.c:2358
3974 +#: dir.c:2351
3975 #, c-format
3976 msgid "could not open directory '%s'"
3977 msgstr "kunde inte öppna katalogen \"%s\""
3978
3977 -#: dir.c:2660
3979 +#: dir.c:2653
3980 msgid "failed to get kernel name and information"
3981 msgstr "misslyckades hämta kärnans namn och information"
3982
3981 -#: dir.c:2784
3983 +#: dir.c:2777
3984 msgid "untracked cache is disabled on this system or location"
3985 msgstr "ospårad cache är inaktiverad på systemet eller platsen"
3986
3985 -#: dir.c:3617
3987 +#: dir.c:3610
3988 #, c-format
3989 msgid "index file corrupt in repo %s"
3990 msgstr "indexfilen trasig i arkivet %s"
3991
3990 -#: dir.c:3664 dir.c:3669
3992 +#: dir.c:3657 dir.c:3662
3993 #, c-format
3994 msgid "could not create directories for %s"
3995 msgstr "kunde inte skapa kataloger för %s"
3996
3995 -#: dir.c:3698
3997 +#: dir.c:3691
3998 #, c-format
3999 msgid "could not migrate git directory from '%s' to '%s'"
4000 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -4016,7 +4018,7 @@ msgstr "kunde inte ta status på filen \"%s\""
4018 msgid "bad git namespace path \"%s\""
4019 msgstr "felaktig git-namnrymdssökväg \"%s\""
4020
4019 -#: environment.c:335
4021 +#: environment.c:334
4022 #, c-format
4023 msgid "could not set GIT_DIR to '%s'"
4024 msgstr "kunde inte ställa in GIT_DIR till \"%s\""
@@ -4183,7 +4185,7 @@ msgstr "källarkivet är grunt, tillåter inte kloning."
4185
4186 #: fetch-pack.c:1128 fetch-pack.c:1660
4187 msgid "git fetch-pack: fetch failed."
4186 -msgstr "git fetch-patch: hämtning misslyckades."
4188 +msgstr "git fetch-pack: hämtning misslyckades."
4189
4190 #: fetch-pack.c:1242
4191 #, c-format
@@ -4651,34 +4653,34 @@ msgstr "citerad CRLF upptäcktes"
4653 msgid "bad action '%s' for '%s'"
4654 msgstr "felaktig funktion \"%s\" för \"%s\""
4655
4654 -#: merge-ort.c:1228 merge-recursive.c:1206
4656 +#: merge-ort.c:1569 merge-recursive.c:1201
4657 #, c-format
4658 msgid "Failed to merge submodule %s (not checked out)"
4659 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
4660
4659 -#: merge-ort.c:1237 merge-recursive.c:1213
4661 +#: merge-ort.c:1578 merge-recursive.c:1208
4662 #, c-format
4663 msgid "Failed to merge submodule %s (commits not present)"
4664 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
4665
4664 -#: merge-ort.c:1246 merge-recursive.c:1220
4666 +#: merge-ort.c:1587 merge-recursive.c:1215
4667 #, c-format
4668 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4669 msgstr ""
4670 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
4671 "sammanslagningsbasen)"
4672
4671 -#: merge-ort.c:1256 merge-ort.c:1263
4673 +#: merge-ort.c:1597 merge-ort.c:1604
4674 #, c-format
4675 msgid "Note: Fast-forwarding submodule %s to %s"
4676 msgstr "Obs: Snabbspolar undermodulen %s till %s"
4677
4676 -#: merge-ort.c:1284
4678 +#: merge-ort.c:1625
4679 #, c-format
4680 msgid "Failed to merge submodule %s"
4681 msgstr "Misslyckades slå ihop undermodulen %s"
4682
4681 -#: merge-ort.c:1291
4683 +#: merge-ort.c:1632
4684 #, c-format
4685 msgid ""
4686 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4687,7 +4689,7 @@ msgstr ""
4689 "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
4690 "%s\n"
4691
4690 -#: merge-ort.c:1295 merge-recursive.c:1274
4692 +#: merge-ort.c:1636 merge-recursive.c:1269
4693 #, c-format
4694 msgid ""
4695 "If this is correct simply add it to the index for example\n"
@@ -4704,7 +4706,7 @@ msgstr ""
4706 "\n"
4707 "vilket godtar lösningen.\n"
4708
4707 -#: merge-ort.c:1308
4709 +#: merge-ort.c:1649
4710 #, c-format
4711 msgid ""
4712 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4714,21 +4716,21 @@ msgstr ""
4716 "finns:\n"
4717 "%s"
4718
4717 -#: merge-ort.c:1527 merge-recursive.c:1363
4719 +#: merge-ort.c:1868 merge-recursive.c:1358
4720 msgid "Failed to execute internal merge"
4721 msgstr "Misslyckades exekvera intern sammanslagning"
4722
4721 -#: merge-ort.c:1532 merge-recursive.c:1368
4723 +#: merge-ort.c:1873 merge-recursive.c:1363
4724 #, c-format
4725 msgid "Unable to add %s to database"
4726 msgstr "Kunde inte lägga till %s till databasen"
4727
4726 -#: merge-ort.c:1539 merge-recursive.c:1401
4728 +#: merge-ort.c:1880 merge-recursive.c:1396
4729 #, c-format
4730 msgid "Auto-merging %s"
4731 msgstr "Slår ihop %s automatiskt"
4732
4731 -#: merge-ort.c:1678 merge-recursive.c:2123
4733 +#: merge-ort.c:2019 merge-recursive.c:2118
4734 #, c-format
4735 msgid ""
4736 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4737,7 +4739,7 @@ msgstr ""
4739 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
4740 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
4741
4740 -#: merge-ort.c:1688 merge-recursive.c:2133
4742 +#: merge-ort.c:2029 merge-recursive.c:2128
4743 #, c-format
4744 msgid ""
4745 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4746,7 +4748,7 @@ msgstr ""
4748 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
4749 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
4750
4749 -#: merge-ort.c:1746
4751 +#: merge-ort.c:2087
4752 #, c-format
4753 msgid ""
4754 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4757,7 +4759,7 @@ msgstr ""
4759 "den har namnbytts till flera andra kataloger, utan att någon destination "
4760 "fick en majoritet av filerna."
4761
4760 -#: merge-ort.c:1900 merge-recursive.c:2469
4762 +#: merge-ort.c:2241 merge-recursive.c:2464
4763 #, c-format
4764 msgid ""
4765 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4766,7 +4768,7 @@ msgstr ""
4768 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
4769 "bytt namn."
4770
4769 -#: merge-ort.c:2044 merge-recursive.c:3252
4771 +#: merge-ort.c:2385 merge-recursive.c:3247
4772 #, c-format
4773 msgid ""
4774 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4775,7 +4777,7 @@ msgstr ""
4777 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
4778 "flyttar den till %s."
4779
4778 -#: merge-ort.c:2051 merge-recursive.c:3259
4780 +#: merge-ort.c:2392 merge-recursive.c:3254
4781 #, c-format
4782 msgid ""
4783 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4784,7 +4786,7 @@ msgstr ""
4786 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
4787 "namn i %s; flyttar den till %s."
4788
4787 -#: merge-ort.c:2064 merge-recursive.c:3255
4789 +#: merge-ort.c:2405 merge-recursive.c:3250
4790 #, c-format
4791 msgid ""
4792 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4793,7 +4795,7 @@ msgstr ""
4795 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
4796 "%s, föreslår att den bör flyttas till%s."
4797
4796 -#: merge-ort.c:2072 merge-recursive.c:3262
4798 +#: merge-ort.c:2413 merge-recursive.c:3257
4799 #, c-format
4800 msgid ""
4801 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4802,13 +4804,13 @@ msgstr ""
4804 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
4805 "bytte namn i %s; flyttar den till %s."
4806
4805 -#: merge-ort.c:2228
4807 +#: merge-ort.c:2569
4808 #, c-format
4809 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4810 msgstr ""
4811 "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
4812
4811 -#: merge-ort.c:2323
4813 +#: merge-ort.c:2664
4814 #, c-format
4815 msgid ""
4816 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4819,23 +4821,23 @@ msgstr ""
4821 "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
4822 "nästlade konfliktmarkörer."
4823
4822 -#: merge-ort.c:2342 merge-ort.c:2366
4824 +#: merge-ort.c:2683 merge-ort.c:2707
4825 #, c-format
4826 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4827 msgstr ""
4828 "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
4829
4828 -#: merge-ort.c:2819 merge-recursive.c:3013
4830 +#: merge-ort.c:3182 merge-recursive.c:3008
4831 #, c-format
4832 msgid "cannot read object %s"
4833 msgstr "kan inte läsa objektet %s"
4834
4833 -#: merge-ort.c:2822 merge-recursive.c:3016
4835 +#: merge-ort.c:3185 merge-recursive.c:3011
4836 #, c-format
4837 msgid "object %s is not a blob"
4838 msgstr "objektet %s är inte en blob"
4839
4838 -#: merge-ort.c:3250
4840 +#: merge-ort.c:3613
4841 #, c-format
4842 msgid ""
4843 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4844,7 +4846,7 @@ msgstr ""
4846 "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
4847 "till %s istället."
4848
4847 -#: merge-ort.c:3326
4849 +#: merge-ort.c:3689
4850 #, c-format
4851 msgid ""
4852 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4853,7 +4855,7 @@ msgstr ""
4855 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
4856 "så att de kan protokollföras någonstans."
4857
4856 -#: merge-ort.c:3333
4858 +#: merge-ort.c:3696
4859 #, c-format
4860 msgid ""
4861 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4862,24 +4864,24 @@ msgstr ""
4864 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
4865 "så att de kan protokollföras någonstans."
4866
4865 -#: merge-ort.c:3433 merge-recursive.c:3092
4867 +#: merge-ort.c:3796 merge-recursive.c:3087
4868 msgid "content"
4869 msgstr "innehåll"
4870
4869 -#: merge-ort.c:3435 merge-recursive.c:3096
4871 +#: merge-ort.c:3798 merge-recursive.c:3091
4872 msgid "add/add"
4873 msgstr "tillägg/tillägg"
4874
4873 -#: merge-ort.c:3437 merge-recursive.c:3141
4875 +#: merge-ort.c:3800 merge-recursive.c:3136
4876 msgid "submodule"
4877 msgstr "undermodul"
4878
4877 -#: merge-ort.c:3439 merge-recursive.c:3142
4879 +#: merge-ort.c:3802 merge-recursive.c:3137
4880 #, c-format
4881 msgid "CONFLICT (%s): Merge conflict in %s"
4882 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
4883
4882 -#: merge-ort.c:3470
4884 +#: merge-ort.c:3833
4885 #, c-format
4886 msgid ""
4887 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4888,7 +4890,7 @@ msgstr ""
4890 "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
4891 "lämnad i trädet."
4892
4891 -#: merge-ort.c:3757
4893 +#: merge-ort.c:4120
4894 #, c-format
4895 msgid ""
4896 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4900,12 +4902,12 @@ msgstr ""
4902 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4903 #. base, and 2-3) the trees for the two trees we're merging.
4904 #.
4903 -#: merge-ort.c:4116
4905 +#: merge-ort.c:4487
4906 #, c-format
4907 msgid "collecting merge info failed for trees %s, %s, %s"
4908 msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
4909
4908 -#: merge-ort-wrappers.c:13 merge-recursive.c:3707
4910 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702
4911 #, c-format
4912 msgid ""
4913 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4915,109 +4917,109 @@ msgstr ""
4917 "sammanslagning:\n"
4918 " %s"
4919
4918 -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
4920 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
4921 msgid "Already up to date."
4922 msgstr "Redan à jour."
4923
4922 -#: merge-recursive.c:357
4924 +#: merge-recursive.c:352
4925 msgid "(bad commit)\n"
4926 msgstr "(felaktig incheckning)\n"
4927
4926 -#: merge-recursive.c:380
4928 +#: merge-recursive.c:375
4929 #, c-format
4930 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4931 msgstr ""
4932 "add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
4933
4932 -#: merge-recursive.c:389
4934 +#: merge-recursive.c:384
4935 #, c-format
4936 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4937 msgstr ""
4938 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
4939 "sammanslagningen."
4940
4939 -#: merge-recursive.c:877
4941 +#: merge-recursive.c:872
4942 #, c-format
4943 msgid "failed to create path '%s'%s"
4944 msgstr "misslyckades skapa sökvägen \"%s\"%s"
4945
4944 -#: merge-recursive.c:888
4946 +#: merge-recursive.c:883
4947 #, c-format
4948 msgid "Removing %s to make room for subdirectory\n"
4949 msgstr "Tar bort %s för att göra plats för underkatalog\n"
4950
4949 -#: merge-recursive.c:902 merge-recursive.c:921
4951 +#: merge-recursive.c:897 merge-recursive.c:916
4952 msgid ": perhaps a D/F conflict?"
4953 msgstr ": kanske en K/F-konflikt?"
4954
4953 -#: merge-recursive.c:911
4955 +#: merge-recursive.c:906
4956 #, c-format
4957 msgid "refusing to lose untracked file at '%s'"
4958 msgstr "vägrar förlora ospårad fil vid \"%s\""
4959
4958 -#: merge-recursive.c:952 builtin/cat-file.c:41
4960 +#: merge-recursive.c:947 builtin/cat-file.c:41
4961 #, c-format
4962 msgid "cannot read object %s '%s'"
4963 msgstr "kan inte läsa objektet %s: \"%s\""
4964
4963 -#: merge-recursive.c:957
4965 +#: merge-recursive.c:952
4966 #, c-format
4967 msgid "blob expected for %s '%s'"
4968 msgstr "blob förväntades för %s \"%s\""
4969
4968 -#: merge-recursive.c:982
4970 +#: merge-recursive.c:977
4971 #, c-format
4972 msgid "failed to open '%s': %s"
4973 msgstr "misslyckades öppna \"%s\": %s"
4974
4973 -#: merge-recursive.c:993
4975 +#: merge-recursive.c:988
4976 #, c-format
4977 msgid "failed to symlink '%s': %s"
4978 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
4979
4978 -#: merge-recursive.c:998
4980 +#: merge-recursive.c:993
4981 #, c-format
4982 msgid "do not know what to do with %06o %s '%s'"
4983 msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
4984
4983 -#: merge-recursive.c:1228 merge-recursive.c:1240
4985 +#: merge-recursive.c:1223 merge-recursive.c:1235
4986 #, c-format
4987 msgid "Fast-forwarding submodule %s to the following commit:"
4988 msgstr "Snabbspolar undermodulen %s till följande incheckning:"
4989
4988 -#: merge-recursive.c:1231 merge-recursive.c:1243
4990 +#: merge-recursive.c:1226 merge-recursive.c:1238
4991 #, c-format
4992 msgid "Fast-forwarding submodule %s"
4993 msgstr "Snabbspolar undermodulen %s"
4994
4993 -#: merge-recursive.c:1266
4995 +#: merge-recursive.c:1261
4996 #, c-format
4997 msgid "Failed to merge submodule %s (merge following commits not found)"
4998 msgstr ""
4999 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
5000 "hittades inte)"
5001
5000 -#: merge-recursive.c:1270
5002 +#: merge-recursive.c:1265
5003 #, c-format
5004 msgid "Failed to merge submodule %s (not fast-forward)"
5005 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
5006
5005 -#: merge-recursive.c:1271
5007 +#: merge-recursive.c:1266
5008 msgid "Found a possible merge resolution for the submodule:\n"
5009 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
5010
5009 -#: merge-recursive.c:1283
5011 +#: merge-recursive.c:1278
5012 #, c-format
5013 msgid "Failed to merge submodule %s (multiple merges found)"
5014 msgstr ""
5015 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
5016
5015 -#: merge-recursive.c:1425
5017 +#: merge-recursive.c:1420
5018 #, c-format
5019 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5020 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
5021
5020 -#: merge-recursive.c:1497
5022 +#: merge-recursive.c:1492
5023 #, c-format
5024 msgid ""
5025 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5026,7 +5028,7 @@ msgstr ""
5028 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
5029 "i trädet."
5030
5029 -#: merge-recursive.c:1502
5031 +#: merge-recursive.c:1497
5032 #, c-format
5033 msgid ""
5034 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5035,7 +5037,7 @@ msgstr ""
5037 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
5038 "%s lämnad i trädet."
5039
5038 -#: merge-recursive.c:1509
5040 +#: merge-recursive.c:1504
5041 #, c-format
5042 msgid ""
5043 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5044,7 +5046,7 @@ msgstr ""
5046 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
5047 "i trädet vid %s."
5048
5047 -#: merge-recursive.c:1514
5049 +#: merge-recursive.c:1509
5050 #, c-format
5051 msgid ""
5052 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5053,40 +5055,40 @@ msgstr ""
5055 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
5056 "%s lämnad i trädet vid %s."
5057
5056 -#: merge-recursive.c:1549
5058 +#: merge-recursive.c:1544
5059 msgid "rename"
5060 msgstr "namnbyte"
5061
5060 -#: merge-recursive.c:1549
5062 +#: merge-recursive.c:1544
5063 msgid "renamed"
5064 msgstr "namnbytt"
5065
5064 -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
5066 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
5067 #, c-format
5068 msgid "Refusing to lose dirty file at %s"
5069 msgstr "Vägrar förlora lortig fil vid \"%s\""
5070
5069 -#: merge-recursive.c:1610
5071 +#: merge-recursive.c:1605
5072 #, c-format
5073 msgid "Refusing to lose untracked file at %s, even though it's in the way."
5074 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
5075
5074 -#: merge-recursive.c:1668
5076 +#: merge-recursive.c:1663
5077 #, c-format
5078 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5079 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
5080
5079 -#: merge-recursive.c:1699
5081 +#: merge-recursive.c:1694
5082 #, c-format
5083 msgid "%s is a directory in %s adding as %s instead"
5084 msgstr "%s är en katalog i %s lägger till som %s istället"
5085
5084 -#: merge-recursive.c:1704
5086 +#: merge-recursive.c:1699
5087 #, c-format
5088 msgid "Refusing to lose untracked file at %s; adding as %s instead"
5089 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
5090
5089 -#: merge-recursive.c:1731
5091 +#: merge-recursive.c:1726
5092 #, c-format
5093 msgid ""
5094 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5095,17 +5097,17 @@ msgstr ""
5097 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
5098 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
5099
5098 -#: merge-recursive.c:1736
5100 +#: merge-recursive.c:1731
5101 msgid " (left unresolved)"
5102 msgstr " (lämnad olöst)"
5103
5102 -#: merge-recursive.c:1828
5104 +#: merge-recursive.c:1823
5105 #, c-format
5106 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5107 msgstr ""
5108 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
5109
5108 -#: merge-recursive.c:2091
5110 +#: merge-recursive.c:2086
5111 #, c-format
5112 msgid ""
5113 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5116,7 +5118,7 @@ msgstr ""
5118 "katalogen %s bytte namn till flera andra kataloger, utan att någon "
5119 "destination fick en majoritet av filerna."
5120
5119 -#: merge-recursive.c:2225
5121 +#: merge-recursive.c:2220
5122 #, c-format
5123 msgid ""
5124 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5125,79 +5127,79 @@ msgstr ""
5127 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
5128 "%s->%s i %s"
5129
5128 -#: merge-recursive.c:3080
5130 +#: merge-recursive.c:3075
5131 msgid "modify"
5132 msgstr "ändra"
5133
5132 -#: merge-recursive.c:3080
5134 +#: merge-recursive.c:3075
5135 msgid "modified"
5136 msgstr "ändrad"
5137
5136 -#: merge-recursive.c:3119
5138 +#: merge-recursive.c:3114
5139 #, c-format
5140 msgid "Skipped %s (merged same as existing)"
5141 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
5142
5141 -#: merge-recursive.c:3172
5143 +#: merge-recursive.c:3167
5144 #, c-format
5145 msgid "Adding as %s instead"
5146 msgstr "Lägger till som %s istället"
5147
5146 -#: merge-recursive.c:3376
5148 +#: merge-recursive.c:3371
5149 #, c-format
5150 msgid "Removing %s"
5151 msgstr "Tar bort %s"
5152
5151 -#: merge-recursive.c:3399
5153 +#: merge-recursive.c:3394
5154 msgid "file/directory"
5155 msgstr "fil/katalog"
5156
5155 -#: merge-recursive.c:3404
5157 +#: merge-recursive.c:3399
5158 msgid "directory/file"
5159 msgstr "katalog/fil"
5160
5159 -#: merge-recursive.c:3411
5161 +#: merge-recursive.c:3406
5162 #, c-format
5163 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5164 msgstr ""
5165 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
5166
5165 -#: merge-recursive.c:3420
5167 +#: merge-recursive.c:3415
5168 #, c-format
5169 msgid "Adding %s"
5170 msgstr "Lägger till %s"
5171
5170 -#: merge-recursive.c:3429
5172 +#: merge-recursive.c:3424
5173 #, c-format
5174 msgid "CONFLICT (add/add): Merge conflict in %s"
5175 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
5176
5175 -#: merge-recursive.c:3482
5177 +#: merge-recursive.c:3477
5178 #, c-format
5179 msgid "merging of trees %s and %s failed"
5180 msgstr "sammanslagning av träden %s och %s misslyckades"
5181
5180 -#: merge-recursive.c:3576
5182 +#: merge-recursive.c:3571
5183 msgid "Merging:"
5184 msgstr "Slår ihop:"
5185
5184 -#: merge-recursive.c:3589
5186 +#: merge-recursive.c:3584
5187 #, c-format
5188 msgid "found %u common ancestor:"
5189 msgid_plural "found %u common ancestors:"
5190 msgstr[0] "hittade %u gemensam förfader:"
5191 msgstr[1] "hittade %u gemensamma förfäder:"
5192
5191 -#: merge-recursive.c:3639
5193 +#: merge-recursive.c:3634
5194 msgid "merge returned no commit"
5195 msgstr "sammanslagningen returnerade ingen incheckning"
5196
5195 -#: merge-recursive.c:3804
5197 +#: merge-recursive.c:3799
5198 #, c-format
5199 msgid "Could not parse object '%s'"
5200 msgstr "Kunde inte tolka objektet \"%s\""
5201
5200 -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
5202 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
5203 #: builtin/stash.c:473
5204 msgid "Unable to write index."
5205 msgstr "Kunde inte skriva indexet."
@@ -5207,7 +5209,7 @@ msgid "failed to read the cache"
5209 msgstr "misslyckades läsa cachen"
5210
5211 #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
5210 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
5212 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
5213 #: builtin/stash.c:267
5214 msgid "unable to write new index file"
5215 msgstr "kunde inte skriva ny indexfil"
@@ -6337,10 +6339,10 @@ msgstr "osorterade köposter för \"%s\""
6339
6340 #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
6341 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
6340 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
6342 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
6343 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
6344 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
6343 -#: builtin/submodule--helper.c:331
6345 +#: builtin/submodule--helper.c:333
6346 msgid "index file corrupt"
6347 msgstr "indexfilen trasig"
6348
@@ -6394,36 +6396,36 @@ msgstr "kunde inte uppdatera delat index \"%s\""
6396 msgid "broken index, expect %s in %s, got %s"
6397 msgstr "trasigt index, förväntade %s i %s, fick %s"
6398
6397 -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
6399 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
6400 #, c-format
6401 msgid "could not close '%s'"
6402 msgstr "kunde inte stänga \"%s\""
6403
6402 -#: read-cache.c:3074
6404 +#: read-cache.c:3075
6405 msgid "failed to convert to a sparse-index"
6406 msgstr "misslyckades omvandla till glest index"
6407
6406 -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
6408 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
6409 #, c-format
6410 msgid "could not stat '%s'"
6411 msgstr "kunde inte ta status på \"%s\""
6412
6411 -#: read-cache.c:3158
6413 +#: read-cache.c:3159
6414 #, c-format
6415 msgid "unable to open git dir: %s"
6416 msgstr "kunde inte öppna git-katalog: %s"
6417
6416 -#: read-cache.c:3170
6418 +#: read-cache.c:3171
6419 #, c-format
6420 msgid "unable to unlink: %s"
6421 msgstr "misslyckades ta bort länken: %s"
6422
6421 -#: read-cache.c:3199
6423 +#: read-cache.c:3200
6424 #, c-format
6425 msgid "cannot fix permission bits on '%s'"
6426 msgstr "kan inte rätta behörighetsbitar på \"%s\""
6427
6426 -#: read-cache.c:3348
6428 +#: read-cache.c:3349
6429 #, c-format
6430 msgid "%s: cannot drop to stage #0"
6431 msgstr "%s: kan inte återgå till kö 0"
@@ -6845,17 +6847,17 @@ msgstr "ignorerar referens med trasigt namn %s"
6847 msgid "ignoring broken ref %s"
6848 msgstr "ignorerar trasig referens %s"
6849
6848 -#: ref-filter.c:2498
6850 +#: ref-filter.c:2502
6851 #, c-format
6852 msgid "format: %%(end) atom missing"
6853 msgstr "format: atomen %%(end) saknas"
6854
6853 -#: ref-filter.c:2592
6855 +#: ref-filter.c:2596
6856 #, c-format
6857 msgid "malformed object name %s"
6858 msgstr "felformat objektnamn %s"
6859
6858 -#: ref-filter.c:2597
6860 +#: ref-filter.c:2601
6861 #, c-format
6862 msgid "option `%s' must point to a commit"
6863 msgstr "flaggan \"%s\" måste peka på en incheckning"
@@ -6885,7 +6887,7 @@ msgstr ""
6887 "\n"
6888 "\tgit config --global init.defaultBranch <namn>\n"
6889 "\n"
6888 -"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n"
6890 +"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
6891 "\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
6892 "\n"
6893 "\tgit branch -m <namn>\n"
@@ -7312,7 +7314,7 @@ msgid "Recorded preimage for '%s'"
7314 msgstr "Sparade förhandsbild för \"%s\""
7315
7316 #: rerere.c:865 submodule.c:2076 builtin/log.c:2002
7315 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
7317 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
7318 #, c-format
7319 msgid "could not create directory '%s'"
7320 msgstr "kunde inte skapa katalogen \"%s\""
@@ -7350,7 +7352,7 @@ msgstr "kan inte uppdatera katalogen rr-cache"
7352 msgid "could not determine HEAD revision"
7353 msgstr "kunde inte bestämma HEAD-revision"
7354
7353 -#: reset.c:70 reset.c:76 sequencer.c:3689
7355 +#: reset.c:69 reset.c:75 sequencer.c:3689
7356 #, c-format
7357 msgid "failed to find tree of %s"
7358 msgstr "kunde inte hitta trädet för %s."
@@ -7558,7 +7560,7 @@ msgid "unable to dequote value of '%s'"
7560 msgstr "kan inte ta bort citering av värdet \"%s\""
7561
7562 #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
7561 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
7563 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
7564 #, c-format
7565 msgid "could not open '%s' for reading"
7566 msgstr "kunde inte öppna \"%s\" för läsning"
@@ -7706,7 +7708,7 @@ msgstr "kunde inte tolka HEAD"
7708 msgid "HEAD %s is not a commit!"
7709 msgstr "HEAD %s är inte en incheckning!"
7710
7709 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
7711 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
7712 msgid "could not parse HEAD commit"
7713 msgstr "kunde inte tolka HEAD:s incheckning"
7714
@@ -7714,7 +7716,7 @@ msgstr "kunde inte tolka HEAD:s incheckning"
7716 msgid "unable to parse commit author"
7717 msgstr "kunde inte tolka incheckningens författare"
7718
7717 -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
7719 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
7720 msgid "git write-tree failed to write a tree"
7721 msgstr "git write-tree misslyckades skriva ett träd"
7722
@@ -7732,8 +7734,8 @@ msgstr "ogiltig författar-identitet \"%s\""
7734 msgid "corrupt author: missing date information"
7735 msgstr "trasig författare: saknar datuminformation"
7736
7735 -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
7736 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
7737 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
7738 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
7739 msgid "failed to write commit object"
7740 msgstr "kunde inte skriva incheckningsobjekt"
7741
@@ -8524,11 +8526,11 @@ msgstr "\"setsid\" misslyckades"
8526 msgid "attempting to use sparse-index without cone mode"
8527 msgstr "försöker använda glest index utan \"cone\"-läge"
8528
8527 -#: sparse-index.c:174
8529 +#: sparse-index.c:176
8530 msgid "unable to update cache-tree, staying full"
8531 msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
8532
8531 -#: sparse-index.c:261
8533 +#: sparse-index.c:263
8534 #, c-format
8535 msgid "index entry is a directory, but not sparse (%08x)"
8536 msgstr "indexposten är en katalog, men inte gles (%08x)"
@@ -8683,7 +8685,7 @@ msgstr ""
8685 msgid "process for submodule '%s' failed"
8686 msgstr "process för undermodulen \"%s\" misslyckades"
8687
8686 -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
8688 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
8689 msgid "Failed to resolve HEAD as a valid ref."
8690 msgstr "Misslyckades slå upp HEAD som giltig referens."
8691
@@ -9432,7 +9434,7 @@ msgstr ""
9434 msgid "Updating index flags"
9435 msgstr "Uppdaterar indexflaggor"
9436
9435 -#: unpack-trees.c:2707
9437 +#: unpack-trees.c:2718
9438 #, c-format
9439 msgid "worktree and untracked commit have duplicate entries: %s"
9440 msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
@@ -10217,7 +10219,7 @@ msgstr "testkörning"
10219 msgid "interactive picking"
10220 msgstr "plocka interaktivt"
10221
10220 -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
10222 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
10223 msgid "select hunks interactively"
10224 msgstr "välj stycken interaktivt"
10225
@@ -10346,14 +10348,14 @@ msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
10348 #: builtin/add.c:526
10349 #, c-format
10350 msgid "--chmod param '%s' must be either -x or +x"
10349 -msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
10351 +msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x"
10352
10351 -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
10353 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
10354 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
10355 msgid "--pathspec-from-file is incompatible with pathspec arguments"
10356 msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
10357
10356 -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
10358 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
10359 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
10360 msgid "--pathspec-file-nul requires --pathspec-from-file"
10361 msgstr "--pathspec-file-nul kräver --pathspec-from-file"
@@ -11175,7 +11177,7 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
11177 msgid "show work cost statistics"
11178 msgstr "visa statistik över arbetskostnad"
11179
11178 -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
11180 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
11181 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
11182 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
11183 #: builtin/push.c:566 builtin/send-pack.c:198
@@ -11532,7 +11534,7 @@ msgstr "visa endast grenar som inte innehåller incheckningen"
11534
11535 #: builtin/branch.c:650
11536 msgid "Specific git-branch actions:"
11535 -msgstr "Specifika git-branch-åtgärder:"
11537 +msgstr "Specifika git-branch åtgärder:"
11538
11539 #: builtin/branch.c:651
11540 msgid "list both remote-tracking and local branches"
@@ -11970,7 +11972,7 @@ msgstr "läs filnamn från standard in"
11972 msgid "terminate input and output records by a NUL character"
11973 msgstr "avsluta in- och utdataposter med NUL-tecken"
11974
11973 -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
11975 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
11976 #: builtin/worktree.c:493
11977 msgid "suppress progress reporting"
11978 msgstr "undertryck förloppsrapportering"
@@ -12029,9 +12031,10 @@ msgid "git checkout--worker [<options>]"
12031 msgstr "git checkout--worker [<flaggor>]"
12032
12033 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
12032 -#: builtin/column.c:31 builtin/submodule--helper.c:1824
12033 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
12034 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
12034 +#: builtin/column.c:31 builtin/submodule--helper.c:1892
12035 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
12036 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
12037 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
12038 #: builtin/worktree.c:728
12039 msgid "string"
12040 msgstr "sträng"
@@ -12126,68 +12129,68 @@ msgstr "sökväg \"%s\": kan inte slå ihop"
12129 msgid "Unable to add merge result for '%s'"
12130 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
12131
12129 -#: builtin/checkout.c:414
12132 +#: builtin/checkout.c:411
12133 #, c-format
12134 msgid "Recreated %d merge conflict"
12135 msgid_plural "Recreated %d merge conflicts"
12136 msgstr[0] "Återskapade %d sammanslagningskonflikt"
12137 msgstr[1] "Återskapade %d sammanslagningskonflikter"
12138
12136 -#: builtin/checkout.c:419
12139 +#: builtin/checkout.c:416
12140 #, c-format
12141 msgid "Updated %d path from %s"
12142 msgid_plural "Updated %d paths from %s"
12143 msgstr[0] "Uppdaterade %d sökväg från %s"
12144 msgstr[1] "Uppdaterade %d sökvägar från %s"
12145
12143 -#: builtin/checkout.c:426
12146 +#: builtin/checkout.c:423
12147 #, c-format
12148 msgid "Updated %d path from the index"
12149 msgid_plural "Updated %d paths from the index"
12150 msgstr[0] "Uppdaterade %d sökväg från indexet"
12151 msgstr[1] "Uppdaterade %d sökvägar från indexet"
12152
12150 -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
12151 -#: builtin/checkout.c:459
12153 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
12154 +#: builtin/checkout.c:456
12155 #, c-format
12156 msgid "'%s' cannot be used with updating paths"
12157 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
12158
12156 -#: builtin/checkout.c:462 builtin/checkout.c:465
12159 +#: builtin/checkout.c:459 builtin/checkout.c:462
12160 #, c-format
12161 msgid "'%s' cannot be used with %s"
12162 msgstr "\"%s\" kan inte användas med %s"
12163
12161 -#: builtin/checkout.c:469
12164 +#: builtin/checkout.c:466
12165 #, c-format
12166 msgid "Cannot update paths and switch to branch '%s' at the same time."
12167 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
12168
12166 -#: builtin/checkout.c:473
12169 +#: builtin/checkout.c:470
12170 #, c-format
12171 msgid "neither '%s' or '%s' is specified"
12172 msgstr "varken \"%s\" eller \"%s\" har angivits"
12173
12171 -#: builtin/checkout.c:477
12174 +#: builtin/checkout.c:474
12175 #, c-format
12176 msgid "'%s' must be used when '%s' is not specified"
12177 msgstr "\"%s\" måste användas när \"%s\" inte anges"
12178
12176 -#: builtin/checkout.c:482 builtin/checkout.c:487
12179 +#: builtin/checkout.c:479 builtin/checkout.c:484
12180 #, c-format
12181 msgid "'%s' or '%s' cannot be used with %s"
12182 msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
12183
12181 -#: builtin/checkout.c:563 builtin/checkout.c:570
12184 +#: builtin/checkout.c:558 builtin/checkout.c:565
12185 #, c-format
12186 msgid "path '%s' is unmerged"
12187 msgstr "sökvägen \"%s\" har inte slagits ihop"
12188
12186 -#: builtin/checkout.c:739
12189 +#: builtin/checkout.c:734
12190 msgid "you need to resolve your current index first"
12191 msgstr "du måste lösa ditt befintliga index först"
12192
12190 -#: builtin/checkout.c:793
12193 +#: builtin/checkout.c:788
12194 #, c-format
12195 msgid ""
12196 "cannot continue with staged changes in the following files:\n"
@@ -12196,50 +12199,50 @@ msgstr ""
12199 "kan inte fortsätta med köade ändringar i följande filer:\n"
12200 "%s"
12201
12199 -#: builtin/checkout.c:886
12202 +#: builtin/checkout.c:881
12203 #, c-format
12204 msgid "Can not do reflog for '%s': %s\n"
12205 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
12206
12204 -#: builtin/checkout.c:928
12207 +#: builtin/checkout.c:923
12208 msgid "HEAD is now at"
12209 msgstr "HEAD är nu på"
12210
12208 -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
12211 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
12212 msgid "unable to update HEAD"
12213 msgstr "kan inte uppdatera HEAD"
12214
12212 -#: builtin/checkout.c:936
12215 +#: builtin/checkout.c:931
12216 #, c-format
12217 msgid "Reset branch '%s'\n"
12218 msgstr "Återställ gren \"%s\"\n"
12219
12217 -#: builtin/checkout.c:939
12220 +#: builtin/checkout.c:934
12221 #, c-format
12222 msgid "Already on '%s'\n"
12223 msgstr "Redan på \"%s\"\n"
12224
12222 -#: builtin/checkout.c:943
12225 +#: builtin/checkout.c:938
12226 #, c-format
12227 msgid "Switched to and reset branch '%s'\n"
12228 msgstr "Växlade till och nollställde grenen \"%s\"\n"
12229
12227 -#: builtin/checkout.c:945 builtin/checkout.c:1376
12230 +#: builtin/checkout.c:940 builtin/checkout.c:1371
12231 #, c-format
12232 msgid "Switched to a new branch '%s'\n"
12233 msgstr "Växlade till en ny gren \"%s\"\n"
12234
12232 -#: builtin/checkout.c:947
12235 +#: builtin/checkout.c:942
12236 #, c-format
12237 msgid "Switched to branch '%s'\n"
12238 msgstr "Växlade till grenen \"%s\"\n"
12239
12237 -#: builtin/checkout.c:998
12240 +#: builtin/checkout.c:993
12241 #, c-format
12242 msgid " ... and %d more.\n"
12243 msgstr " ... och %d till.\n"
12244
12242 -#: builtin/checkout.c:1004
12245 +#: builtin/checkout.c:999
12246 #, c-format
12247 msgid ""
12248 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12262,7 +12265,7 @@ msgstr[1] ""
12265 "\n"
12266 "%s\n"
12267
12265 -#: builtin/checkout.c:1023
12268 +#: builtin/checkout.c:1018
12269 #, c-format
12270 msgid ""
12271 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12289,19 +12292,19 @@ msgstr[1] ""
12292 " git branch <nytt_grennamn> %s\n"
12293 "\n"
12294
12292 -#: builtin/checkout.c:1058
12295 +#: builtin/checkout.c:1053
12296 msgid "internal error in revision walk"
12297 msgstr "internt fel vid genomgång av revisioner (revision walk)"
12298
12296 -#: builtin/checkout.c:1062
12299 +#: builtin/checkout.c:1057
12300 msgid "Previous HEAD position was"
12301 msgstr "Tidigare position för HEAD var"
12302
12300 -#: builtin/checkout.c:1102 builtin/checkout.c:1371
12303 +#: builtin/checkout.c:1097 builtin/checkout.c:1366
12304 msgid "You are on a branch yet to be born"
12305 msgstr "Du är på en gren som ännu inte är född"
12306
12304 -#: builtin/checkout.c:1184
12307 +#: builtin/checkout.c:1179
12308 #, c-format
12309 msgid ""
12310 "'%s' could be both a local file and a tracking branch.\n"
@@ -12310,7 +12313,7 @@ msgstr ""
12313 "\"%s\" kan vara både en lokal fil och en spårande gren.\n"
12314 "Använd -- (och möjligen --no-guess) för att göra otvetydig"
12315
12313 -#: builtin/checkout.c:1191
12316 +#: builtin/checkout.c:1186
12317 msgid ""
12318 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
12319 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12330,51 +12333,51 @@ msgstr ""
12333 "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
12334 "checkout.defaultRemote=origin i din konfiguration."
12335
12333 -#: builtin/checkout.c:1201
12336 +#: builtin/checkout.c:1196
12337 #, c-format
12338 msgid "'%s' matched multiple (%d) remote tracking branches"
12339 msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
12340
12338 -#: builtin/checkout.c:1267
12341 +#: builtin/checkout.c:1262
12342 msgid "only one reference expected"
12343 msgstr "endast en referens förväntades"
12344
12342 -#: builtin/checkout.c:1284
12345 +#: builtin/checkout.c:1279
12346 #, c-format
12347 msgid "only one reference expected, %d given."
12348 msgstr "endast en referens förväntades, %d gavs."
12349
12347 -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
12350 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
12351 #, c-format
12352 msgid "invalid reference: %s"
12353 msgstr "felaktig referens: %s"
12354
12352 -#: builtin/checkout.c:1343 builtin/checkout.c:1709
12355 +#: builtin/checkout.c:1338 builtin/checkout.c:1707
12356 #, c-format
12357 msgid "reference is not a tree: %s"
12358 msgstr "referensen är inte ett träd: %s"
12359
12357 -#: builtin/checkout.c:1390
12360 +#: builtin/checkout.c:1385
12361 #, c-format
12362 msgid "a branch is expected, got tag '%s'"
12363 msgstr "förväntade gren, fick taggen \"%s\""
12364
12362 -#: builtin/checkout.c:1392
12365 +#: builtin/checkout.c:1387
12366 #, c-format
12367 msgid "a branch is expected, got remote branch '%s'"
12368 msgstr "förväntade gren, fick fjärrgrenen \"%s\""
12369
12367 -#: builtin/checkout.c:1393 builtin/checkout.c:1401
12370 +#: builtin/checkout.c:1388 builtin/checkout.c:1396
12371 #, c-format
12372 msgid "a branch is expected, got '%s'"
12373 msgstr "förväntade gren, fick \"%s\""
12374
12372 -#: builtin/checkout.c:1396
12375 +#: builtin/checkout.c:1391
12376 #, c-format
12377 msgid "a branch is expected, got commit '%s'"
12378 msgstr "förväntade gren, fick incheckningen \"%s\""
12379
12377 -#: builtin/checkout.c:1412
12380 +#: builtin/checkout.c:1407
12381 msgid ""
12382 "cannot switch branch while merging\n"
12383 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12382,7 +12385,7 @@ msgstr ""
12385 "kan inte växla gren vid sammanslagning\n"
12386 "Överväg \"git merge --quit\" eller \"git worktree add\"."
12387
12385 -#: builtin/checkout.c:1416
12388 +#: builtin/checkout.c:1411
12389 msgid ""
12390 "cannot switch branch in the middle of an am session\n"
12391 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12390,7 +12393,7 @@ msgstr ""
12393 "kan inte växla gren mitt i en \"am\"-körning\n"
12394 "Överväg \"git am --quit\" eller \"git worktree add\"."
12395
12393 -#: builtin/checkout.c:1420
12396 +#: builtin/checkout.c:1415
12397 msgid ""
12398 "cannot switch branch while rebasing\n"
12399 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12398,7 +12401,7 @@ msgstr ""
12401 "kan inte växla gren vid ombasering\n"
12402 "Överväg \"git rebase --quit\" eller \"git worktree add\"."
12403
12401 -#: builtin/checkout.c:1424
12404 +#: builtin/checkout.c:1419
12405 msgid ""
12406 "cannot switch branch while cherry-picking\n"
12407 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12406,7 +12409,7 @@ msgstr ""
12409 "kan inte växla gren i en \"cherry-pick\"\n"
12410 "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
12411
12409 -#: builtin/checkout.c:1428
12412 +#: builtin/checkout.c:1423
12413 msgid ""
12414 "cannot switch branch while reverting\n"
12415 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12414,139 +12417,139 @@ msgstr ""
12417 "kan inte växla gren i en \"revert\"\n"
12418 "Överväg \"git revert --quit\" eller \"git worktree add\"."
12419
12417 -#: builtin/checkout.c:1432
12420 +#: builtin/checkout.c:1427
12421 msgid "you are switching branch while bisecting"
12422 msgstr "då växlar grenar medan du gör en \"bisect\""
12423
12421 -#: builtin/checkout.c:1439
12424 +#: builtin/checkout.c:1434
12425 msgid "paths cannot be used with switching branches"
12426 msgstr "sökvägar kan inte användas vid byte av gren"
12427
12425 -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
12428 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
12429 #, c-format
12430 msgid "'%s' cannot be used with switching branches"
12431 msgstr "\"%s\" kan inte användas vid byte av gren"
12432
12430 -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
12431 -#: builtin/checkout.c:1465 builtin/checkout.c:1470
12433 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
12434 +#: builtin/checkout.c:1460 builtin/checkout.c:1465
12435 #, c-format
12436 msgid "'%s' cannot be used with '%s'"
12437 msgstr "\"%s\" kan inte användas med \"%s\""
12438
12436 -#: builtin/checkout.c:1467
12439 +#: builtin/checkout.c:1462
12440 #, c-format
12441 msgid "'%s' cannot take <start-point>"
12442 msgstr "\"%s\" kan inte ta <startpunkt>"
12443
12441 -#: builtin/checkout.c:1475
12444 +#: builtin/checkout.c:1470
12445 #, c-format
12446 msgid "Cannot switch branch to a non-commit '%s'"
12447 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
12448
12446 -#: builtin/checkout.c:1482
12449 +#: builtin/checkout.c:1477
12450 msgid "missing branch or commit argument"
12451 msgstr "saknar gren- eller incheckingsargument"
12452
12450 -#: builtin/checkout.c:1525
12453 +#: builtin/checkout.c:1520
12454 msgid "perform a 3-way merge with the new branch"
12455 msgstr "utför en 3-vägssammanslagning för den nya grenen"
12456
12454 -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
12457 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
12458 msgid "style"
12459 msgstr "stil"
12460
12458 -#: builtin/checkout.c:1527
12461 +#: builtin/checkout.c:1522
12462 msgid "conflict style (merge or diff3)"
12463 msgstr "konfliktstil (merge eller diff3)"
12464
12462 -#: builtin/checkout.c:1539 builtin/worktree.c:488
12465 +#: builtin/checkout.c:1534 builtin/worktree.c:488
12466 msgid "detach HEAD at named commit"
12467 msgstr "koppla från HEAD vid namngiven incheckning"
12468
12466 -#: builtin/checkout.c:1540
12469 +#: builtin/checkout.c:1535
12470 msgid "set upstream info for new branch"
12471 msgstr "sätt uppströmsinformation för ny gren"
12472
12470 -#: builtin/checkout.c:1542
12473 +#: builtin/checkout.c:1537
12474 msgid "force checkout (throw away local modifications)"
12475 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
12476
12474 -#: builtin/checkout.c:1544
12477 +#: builtin/checkout.c:1539
12478 msgid "new-branch"
12479 msgstr "ny-gren"
12480
12478 -#: builtin/checkout.c:1544
12481 +#: builtin/checkout.c:1539
12482 msgid "new unparented branch"
12483 msgstr "ny gren utan förälder"
12484
12482 -#: builtin/checkout.c:1546 builtin/merge.c:301
12485 +#: builtin/checkout.c:1541 builtin/merge.c:301
12486 msgid "update ignored files (default)"
12487 msgstr "uppdatera ignorerade filer (standard)"
12488
12486 -#: builtin/checkout.c:1549
12489 +#: builtin/checkout.c:1544
12490 msgid "do not check if another worktree is holding the given ref"
12491 msgstr ""
12492 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"
12493
12491 -#: builtin/checkout.c:1562
12494 +#: builtin/checkout.c:1557
12495 msgid "checkout our version for unmerged files"
12496 msgstr "checka ut vår version för ej sammanslagna filer"
12497
12495 -#: builtin/checkout.c:1565
12498 +#: builtin/checkout.c:1560
12499 msgid "checkout their version for unmerged files"
12500 msgstr "checka ut deras version för ej sammanslagna filer"
12501
12499 -#: builtin/checkout.c:1569
12502 +#: builtin/checkout.c:1564
12503 msgid "do not limit pathspecs to sparse entries only"
12504 msgstr "begränsa inte sökvägar till endast glesa poster"
12505
12503 -#: builtin/checkout.c:1624
12506 +#: builtin/checkout.c:1622
12507 #, c-format
12508 msgid "-%c, -%c and --orphan are mutually exclusive"
12509 msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
12510
12508 -#: builtin/checkout.c:1628
12511 +#: builtin/checkout.c:1626
12512 msgid "-p and --overlay are mutually exclusive"
12513 msgstr "-p och --overlay är ömsesidigt uteslutande"
12514
12512 -#: builtin/checkout.c:1665
12515 +#: builtin/checkout.c:1663
12516 msgid "--track needs a branch name"
12517 msgstr "--track behöver ett namn på en gren"
12518
12516 -#: builtin/checkout.c:1670
12519 +#: builtin/checkout.c:1668
12520 #, c-format
12521 msgid "missing branch name; try -%c"
12522 msgstr "grennamn saknas; försök med -%c"
12523
12521 -#: builtin/checkout.c:1702
12524 +#: builtin/checkout.c:1700
12525 #, c-format
12526 msgid "could not resolve %s"
12527 msgstr "kunde inte upplösa %s"
12528
12526 -#: builtin/checkout.c:1718
12529 +#: builtin/checkout.c:1716
12530 msgid "invalid path specification"
12531 msgstr "felaktig sökvägsangivelse"
12532
12530 -#: builtin/checkout.c:1725
12533 +#: builtin/checkout.c:1723
12534 #, c-format
12535 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
12536 msgstr ""
12537 "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
12538
12536 -#: builtin/checkout.c:1729
12539 +#: builtin/checkout.c:1727
12540 #, c-format
12541 msgid "git checkout: --detach does not take a path argument '%s'"
12542 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
12543
12541 -#: builtin/checkout.c:1738
12544 +#: builtin/checkout.c:1736
12545 msgid "--pathspec-from-file is incompatible with --detach"
12546 msgstr "--pathspec-from-file är inkompatibelt med --detach"
12547
12545 -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
12548 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
12549 msgid "--pathspec-from-file is incompatible with --patch"
12550 msgstr "--pathspec-from-file är inkompatibelt med --patch"
12551
12549 -#: builtin/checkout.c:1754
12552 +#: builtin/checkout.c:1752
12553 msgid ""
12554 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
12555 "checking out of the index."
@@ -12554,70 +12557,71 @@ msgstr ""
12557 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
12558 "du checkar ut från indexet."
12559
12557 -#: builtin/checkout.c:1759
12560 +#: builtin/checkout.c:1757
12561 msgid "you must specify path(s) to restore"
12562 msgstr "du måste ange katalog(er) att återställa"
12563
12561 -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
12562 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
12563 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
12564 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
12565 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
12566 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736
12567 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
12568 #: builtin/worktree.c:486
12569 msgid "branch"
12570 msgstr "gren"
12571
12568 -#: builtin/checkout.c:1786
12572 +#: builtin/checkout.c:1784
12573 msgid "create and checkout a new branch"
12574 msgstr "skapa och checka ut en ny gren"
12575
12572 -#: builtin/checkout.c:1788
12576 +#: builtin/checkout.c:1786
12577 msgid "create/reset and checkout a branch"
12578 msgstr "skapa/nollställ och checka ut en gren"
12579
12576 -#: builtin/checkout.c:1789
12580 +#: builtin/checkout.c:1787
12581 msgid "create reflog for new branch"
12582 msgstr "skapa reflogg för ny gren"
12583
12580 -#: builtin/checkout.c:1791
12584 +#: builtin/checkout.c:1789
12585 msgid "second guess 'git checkout <no-such-branch>' (default)"
12586 msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
12587
12584 -#: builtin/checkout.c:1792
12588 +#: builtin/checkout.c:1790
12589 msgid "use overlay mode (default)"
12590 msgstr "använd överläggsläge (standard)"
12591
12588 -#: builtin/checkout.c:1837
12592 +#: builtin/checkout.c:1835
12593 msgid "create and switch to a new branch"
12594 msgstr "skapa och växla till en ny gren"
12595
12592 -#: builtin/checkout.c:1839
12596 +#: builtin/checkout.c:1837
12597 msgid "create/reset and switch to a branch"
12598 msgstr "skapa/nollställ och växla till en gren"
12599
12596 -#: builtin/checkout.c:1841
12600 +#: builtin/checkout.c:1839
12601 msgid "second guess 'git switch <no-such-branch>'"
12602 msgstr "förutspå \"git checkout <gren-saknas>\""
12603
12600 -#: builtin/checkout.c:1843
12604 +#: builtin/checkout.c:1841
12605 msgid "throw away local modifications"
12606 msgstr "kasta bort lokala ändringar"
12607
12604 -#: builtin/checkout.c:1877
12608 +#: builtin/checkout.c:1875
12609 msgid "which tree-ish to checkout from"
12610 msgstr "vilken träd-igt att checka ut från"
12611
12608 -#: builtin/checkout.c:1879
12612 +#: builtin/checkout.c:1877
12613 msgid "restore the index"
12614 msgstr "återställ indexet"
12615
12612 -#: builtin/checkout.c:1881
12616 +#: builtin/checkout.c:1879
12617 msgid "restore the working tree (default)"
12618 msgstr "återställ arbetskatalogen (förval)"
12619
12616 -#: builtin/checkout.c:1883
12620 +#: builtin/checkout.c:1881
12621 msgid "ignore unmerged entries"
12622 msgstr "ignorera ej sammanslagna poster"
12623
12620 -#: builtin/checkout.c:1884
12624 +#: builtin/checkout.c:1882
12625 msgid "use overlay mode"
12626 msgstr "använd överläggsläge"
12627
@@ -12848,13 +12852,13 @@ msgstr "mallkatalog"
12852 msgid "directory from which templates will be used"
12853 msgstr "katalog att använda mallar från"
12854
12851 -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
12852 -#: builtin/submodule--helper.c:2336
12855 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
12856 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
12857 msgid "reference repository"
12858 msgstr "referensarkiv"
12859
12856 -#: builtin/clone.c:123 builtin/submodule--helper.c:1833
12857 -#: builtin/submodule--helper.c:2338
12860 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901
12861 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
12862 msgid "use --reference only while cloning"
12863 msgstr "använd --reference endast under kloningen"
12864
@@ -12903,8 +12907,8 @@ msgstr "revision"
12907 msgid "deepen history of shallow clone, excluding rev"
12908 msgstr "fördjupa historik för grund klon, exkludera revisionen"
12909
12906 -#: builtin/clone.c:137 builtin/submodule--helper.c:1843
12907 -#: builtin/submodule--helper.c:2352
12910 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911
12911 +#: builtin/submodule--helper.c:2369
12912 msgid "clone only one branch, HEAD or --branch"
12913 msgstr "klona endast en gren, HEAD eller --branch"
12914
@@ -13013,7 +13017,7 @@ msgid ""
13017 msgstr ""
13018 "Klonen lyckades, men utcheckningen misslyckades.\n"
13019 "Du kan inspektera det som checkades ut med \"git status\"\n"
13016 -"och försöka med \"git restore -source=HEAD :/\"\n"
13020 +"och försöka med \"git restore --source=HEAD :/\"\n"
13021
13022 #: builtin/clone.c:594
13023 #, c-format
@@ -13293,7 +13297,7 @@ msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna"
13297
13298 #: builtin/commit-graph.c:255
13299 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
13296 -msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"
13300 +msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
13301
13302 #: builtin/commit-graph.c:287
13303 msgid "Collecting commits from input"
@@ -13952,36 +13956,36 @@ msgstr "ok att registrera en tom ändring"
13956 msgid "ok to record a change with an empty message"
13957 msgstr "ok att registrera en ändring med tomt meddelande"
13958
13955 -#: builtin/commit.c:1747
13959 +#: builtin/commit.c:1750
13960 #, c-format
13961 msgid "Corrupt MERGE_HEAD file (%s)"
13962 msgstr "Trasig MERGE_HEAD-fil (%s)"
13963
13960 -#: builtin/commit.c:1754
13964 +#: builtin/commit.c:1757
13965 msgid "could not read MERGE_MODE"
13966 msgstr "kunde inte läsa MERGE_MODE"
13967
13964 -#: builtin/commit.c:1775
13968 +#: builtin/commit.c:1778
13969 #, c-format
13970 msgid "could not read commit message: %s"
13971 msgstr "kunde inte läsa incheckningsmeddelande: %s"
13972
13969 -#: builtin/commit.c:1782
13973 +#: builtin/commit.c:1785
13974 #, c-format
13975 msgid "Aborting commit due to empty commit message.\n"
13976 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
13977
13974 -#: builtin/commit.c:1787
13978 +#: builtin/commit.c:1790
13979 #, c-format
13980 msgid "Aborting commit; you did not edit the message.\n"
13981 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
13982
13979 -#: builtin/commit.c:1798
13983 +#: builtin/commit.c:1801
13984 #, c-format
13985 msgid "Aborting commit due to empty commit message body.\n"
13986 msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
13987
13984 -#: builtin/commit.c:1834
13988 +#: builtin/commit.c:1837
13989 msgid ""
13990 "repository has been updated, but unable to write\n"
13991 "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"
15348 msgid "git for-each-repo --config=<config> <command-args>"
15349 msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
15350
15347 -#: builtin/for-each-repo.c:37
15351 +#: builtin/for-each-repo.c:34
15352 msgid "config"
15353 msgstr "konfig"
15354
15351 -#: builtin/for-each-repo.c:38
15355 +#: builtin/for-each-repo.c:35
15356 msgid "config key storing a list of repository paths"
15357 msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar"
15358
15355 -#: builtin/for-each-repo.c:46
15359 +#: builtin/for-each-repo.c:43
15360 msgid "missing --config=<config>"
15361 msgstr "saknar --config=<konfig>"
15362
@@ -16728,7 +16732,7 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\""
16732
16733 #: builtin/init-db.c:684
16734 msgid "--separate-git-dir incompatible with bare repository"
16731 -msgstr "--separatebgit-dir är inkompatibelt med naket arkiv"
16735 +msgstr "--separate-git-dir är inkompatibelt med naket arkiv"
16736
16737 #: builtin/interpret-trailers.c:16
16738 msgid ""
@@ -17711,38 +17715,38 @@ msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
17715 msgid "'%s' does not point to a commit"
17716 msgstr "\"%s\" verkar inte peka på en incheckning"
17717
17714 -#: builtin/merge.c:602
17718 +#: builtin/merge.c:603
17719 #, c-format
17720 msgid "Bad branch.%s.mergeoptions string: %s"
17721 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
17722
17719 -#: builtin/merge.c:728
17723 +#: builtin/merge.c:729
17724 msgid "Not handling anything other than two heads merge."
17725 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
17726
17723 -#: builtin/merge.c:741
17727 +#: builtin/merge.c:742
17728 #, c-format
17729 msgid "Unknown option for merge-recursive: -X%s"
17730 msgstr "Felaktig flagga för merge-recursive: -X%s"
17731
17728 -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
17732 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
17733 #, c-format
17734 msgid "unable to write %s"
17735 msgstr "kunde inte skriva %s"
17736
17733 -#: builtin/merge.c:812
17737 +#: builtin/merge.c:813
17738 #, c-format
17739 msgid "Could not read from '%s'"
17740 msgstr "Kunde inte läsa från \"%s\""
17741
17738 -#: builtin/merge.c:821
17742 +#: builtin/merge.c:822
17743 #, c-format
17744 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
17745 msgstr ""
17746 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
17747 "den.\n"
17748
17745 -#: builtin/merge.c:827
17749 +#: builtin/merge.c:828
17750 msgid ""
17751 "Please enter a commit message to explain why this merge is necessary,\n"
17752 "especially if it merges an updated upstream into a topic branch.\n"
@@ -17753,11 +17757,11 @@ msgstr ""
17757 "temagren.\n"
17758 "\n"
17759
17756 -#: builtin/merge.c:832
17760 +#: builtin/merge.c:833
17761 msgid "An empty message aborts the commit.\n"
17762 msgstr "Ett tomt meddelande avbryter incheckningen.\n"
17763
17760 -#: builtin/merge.c:835
17764 +#: builtin/merge.c:836
17765 #, c-format
17766 msgid ""
17767 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17766,73 +17770,73 @@ msgstr ""
17770 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
17771 "avbryter incheckningen.\n"
17772
17769 -#: builtin/merge.c:888
17773 +#: builtin/merge.c:889
17774 msgid "Empty commit message."
17775 msgstr "Tomt incheckningsmeddelande."
17776
17773 -#: builtin/merge.c:903
17777 +#: builtin/merge.c:904
17778 #, c-format
17779 msgid "Wonderful.\n"
17780 msgstr "Underbart.\n"
17781
17778 -#: builtin/merge.c:964
17782 +#: builtin/merge.c:965
17783 #, c-format
17784 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
17785 msgstr ""
17786 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
17787
17784 -#: builtin/merge.c:1003
17788 +#: builtin/merge.c:1004
17789 msgid "No current branch."
17790 msgstr "Inte på någon gren."
17791
17788 -#: builtin/merge.c:1005
17792 +#: builtin/merge.c:1006
17793 msgid "No remote for the current branch."
17794 msgstr "Ingen fjärr för aktuell gren."
17795
17792 -#: builtin/merge.c:1007
17796 +#: builtin/merge.c:1008
17797 msgid "No default upstream defined for the current branch."
17798 msgstr "Ingen standarduppström angiven för aktuell gren."
17799
17796 -#: builtin/merge.c:1012
17800 +#: builtin/merge.c:1013
17801 #, c-format
17802 msgid "No remote-tracking branch for %s from %s"
17803 msgstr "Ingen fjärrspårande gren för %s från %s"
17804
17801 -#: builtin/merge.c:1069
17805 +#: builtin/merge.c:1070
17806 #, c-format
17807 msgid "Bad value '%s' in environment '%s'"
17808 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
17809
17806 -#: builtin/merge.c:1172
17810 +#: builtin/merge.c:1173
17811 #, c-format
17812 msgid "not something we can merge in %s: %s"
17813 msgstr "inte något vi kan slå ihop med %s: %s"
17814
17811 -#: builtin/merge.c:1206
17815 +#: builtin/merge.c:1207
17816 msgid "not something we can merge"
17817 msgstr "inte något vi kan slå ihop"
17818
17815 -#: builtin/merge.c:1316
17819 +#: builtin/merge.c:1317
17820 msgid "--abort expects no arguments"
17821 msgstr "--abort tar inga argument"
17822
17819 -#: builtin/merge.c:1320
17823 +#: builtin/merge.c:1321
17824 msgid "There is no merge to abort (MERGE_HEAD missing)."
17825 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
17826
17823 -#: builtin/merge.c:1338
17827 +#: builtin/merge.c:1339
17828 msgid "--quit expects no arguments"
17829 msgstr "--quit tar inga argument"
17830
17827 -#: builtin/merge.c:1351
17831 +#: builtin/merge.c:1352
17832 msgid "--continue expects no arguments"
17833 msgstr "--continue tar inga argument"
17834
17831 -#: builtin/merge.c:1355
17835 +#: builtin/merge.c:1356
17836 msgid "There is no merge in progress (MERGE_HEAD missing)."
17837 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
17838
17835 -#: builtin/merge.c:1371
17839 +#: builtin/merge.c:1372
17840 msgid ""
17841 "You have not concluded your merge (MERGE_HEAD exists).\n"
17842 "Please, commit your changes before you merge."
@@ -17840,7 +17844,7 @@ msgstr ""
17844 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
17845 "Checka in dina ändringar innan du slår ihop."
17846
17843 -#: builtin/merge.c:1378
17847 +#: builtin/merge.c:1379
17848 msgid ""
17849 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
17850 "Please, commit your changes before you merge."
@@ -17848,88 +17852,88 @@ msgstr ""
17852 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
17853 "Checka in dina ändringar innan du slår ihop."
17854
17851 -#: builtin/merge.c:1381
17855 +#: builtin/merge.c:1382
17856 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
17857 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
17858
17855 -#: builtin/merge.c:1395
17859 +#: builtin/merge.c:1396
17860 msgid "You cannot combine --squash with --no-ff."
17861 msgstr "Du kan inte kombinera --squash med --no-ff."
17862
17859 -#: builtin/merge.c:1397
17863 +#: builtin/merge.c:1398
17864 msgid "You cannot combine --squash with --commit."
17865 msgstr "Du kan inte kombinera --squash med --commit."
17866
17863 -#: builtin/merge.c:1413
17867 +#: builtin/merge.c:1414
17868 msgid "No commit specified and merge.defaultToUpstream not set."
17869 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
17870
17867 -#: builtin/merge.c:1430
17871 +#: builtin/merge.c:1431
17872 msgid "Squash commit into empty head not supported yet"
17873 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
17874
17871 -#: builtin/merge.c:1432
17875 +#: builtin/merge.c:1433
17876 msgid "Non-fast-forward commit does not make sense into an empty head"
17877 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
17878
17875 -#: builtin/merge.c:1437
17879 +#: builtin/merge.c:1438
17880 #, c-format
17881 msgid "%s - not something we can merge"
17882 msgstr "%s - inte något vi kan slå ihop"
17883
17880 -#: builtin/merge.c:1439
17884 +#: builtin/merge.c:1440
17885 msgid "Can merge only exactly one commit into empty head"
17886 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
17887
17884 -#: builtin/merge.c:1520
17888 +#: builtin/merge.c:1521
17889 msgid "refusing to merge unrelated histories"
17890 msgstr "vägrar slå samman orelaterad historik"
17891
17888 -#: builtin/merge.c:1539
17892 +#: builtin/merge.c:1540
17893 #, c-format
17894 msgid "Updating %s..%s\n"
17895 msgstr "Uppdaterar %s..%s\n"
17896
17893 -#: builtin/merge.c:1585
17897 +#: builtin/merge.c:1587
17898 #, c-format
17899 msgid "Trying really trivial in-index merge...\n"
17900 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
17901
17898 -#: builtin/merge.c:1592
17902 +#: builtin/merge.c:1594
17903 #, c-format
17904 msgid "Nope.\n"
17905 msgstr "Nej.\n"
17906
17903 -#: builtin/merge.c:1623
17907 +#: builtin/merge.c:1625
17908 msgid "Not possible to fast-forward, aborting."
17909 msgstr "Kan inte snabbspola, avbryter."
17910
17907 -#: builtin/merge.c:1651 builtin/merge.c:1716
17911 +#: builtin/merge.c:1653 builtin/merge.c:1719
17912 #, c-format
17913 msgid "Rewinding the tree to pristine...\n"
17914 msgstr "Återspolar trädet till orört...\n"
17915
17912 -#: builtin/merge.c:1655
17916 +#: builtin/merge.c:1657
17917 #, c-format
17918 msgid "Trying merge strategy %s...\n"
17919 msgstr "Försöker sammanslagningsstrategin %s...\n"
17920
17917 -#: builtin/merge.c:1707
17921 +#: builtin/merge.c:1709
17922 #, c-format
17923 msgid "No merge strategy handled the merge.\n"
17924 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
17925
17922 -#: builtin/merge.c:1709
17926 +#: builtin/merge.c:1711
17927 #, c-format
17928 msgid "Merge with strategy %s failed.\n"
17929 msgstr "Sammanslagning med strategin %s misslyckades.\n"
17930
17927 -#: builtin/merge.c:1718
17931 +#: builtin/merge.c:1721
17932 #, c-format
17929 -msgid "Using the %s to prepare resolving by hand.\n"
17930 -msgstr "Använder %s för att förbereda lösning för hand.\n"
17933 +msgid "Using the %s strategy to prepare resolving by hand.\n"
17934 +msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
17935
17932 -#: builtin/merge.c:1732
17936 +#: builtin/merge.c:1735
17937 #, c-format
17938 msgid "Automatic merge went well; stopped before committing as requested\n"
17939 msgstr ""
@@ -18979,7 +18983,7 @@ msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
18983
18984 #: builtin/pack-objects.c:4104
18985 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
18982 -msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
18986 +msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
18987
18988 #: builtin/pack-objects.c:4110
18989 msgid "cannot use --filter without --stdout"
@@ -20255,7 +20259,7 @@ msgid "fatal: no such branch/commit '%s'"
20259 msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
20260
20261 #: builtin/rebase.c:1929 builtin/submodule--helper.c:39
20258 -#: builtin/submodule--helper.c:2414
20262 +#: builtin/submodule--helper.c:2431
20263 #, c-format
20264 msgid "No such ref: %s"
20265 msgstr "Ingen sådan referens: %s"
@@ -21825,7 +21829,7 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]"
21829
21830 #: builtin/shortlog.c:123
21831 msgid "using multiple --group options with stdin is not supported"
21828 -msgstr "mer än en --group-flagga stöds inte med standard in"
21832 +msgstr "mer än en --group flagga stöds inte med standard in"
21833
21834 #: builtin/shortlog.c:133
21835 msgid "using --group=trailer with stdin is not supported"
@@ -22106,37 +22110,37 @@ msgstr "misslyckades ändra inställning för sparse-index"
22110 msgid "failed to open '%s'"
22111 msgstr "misslyckades öppna \"%s\""
22112
22109 -#: builtin/sparse-checkout.c:419
22113 +#: builtin/sparse-checkout.c:413
22114 #, c-format
22115 msgid "could not normalize path %s"
22116 msgstr "kunde inte normalisera sökvägen \"%s\""
22117
22114 -#: builtin/sparse-checkout.c:431
22118 +#: builtin/sparse-checkout.c:425
22119 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
22120 msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
22121
22118 -#: builtin/sparse-checkout.c:456
22122 +#: builtin/sparse-checkout.c:450
22123 #, c-format
22124 msgid "unable to unquote C-style string '%s'"
22125 msgstr "kan inte ta bort citering av C-sträng \"%s\""
22126
22123 -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
22127 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
22128 msgid "unable to load existing sparse-checkout patterns"
22129 msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
22130
22127 -#: builtin/sparse-checkout.c:579
22131 +#: builtin/sparse-checkout.c:573
22132 msgid "read patterns from standard in"
22133 msgstr "läs mönster från standard in"
22134
22131 -#: builtin/sparse-checkout.c:594
22135 +#: builtin/sparse-checkout.c:588
22136 msgid "git sparse-checkout reapply"
22137 msgstr "git sparse-checkout reapply"
22138
22135 -#: builtin/sparse-checkout.c:613
22139 +#: builtin/sparse-checkout.c:607
22140 msgid "git sparse-checkout disable"
22141 msgstr "git sparse-checkout disable"
22142
22139 -#: builtin/sparse-checkout.c:644
22143 +#: builtin/sparse-checkout.c:638
22144 msgid "error while refreshing working directory"
22145 msgstr "fel vid uppdatering av arbetskatalog"
22146
@@ -22419,7 +22423,7 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
22423 msgid "prepend comment character and space to each line"
22424 msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
22425
22422 -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
22426 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
22427 #, c-format
22428 msgid "Expecting a full ref name, got %s"
22429 msgstr "Förväntade fullt referensnamn, fick %s"
@@ -22433,26 +22437,27 @@ msgstr "submodule--helper print-default-remote tar inga argument"
22437 msgid "cannot strip one component off url '%s'"
22438 msgstr "kan inte ta bort en komponent från url:en \"%s\""
22439
22436 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
22440 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
22441 +#: builtin/submodule--helper.c:2891
22442 msgid "alternative anchor for relative paths"
22443 msgstr "alternativa ankare för relativa sökvägar"
22444
22440 -#: builtin/submodule--helper.c:414
22445 +#: builtin/submodule--helper.c:416
22446 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
22447 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
22448
22444 -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
22445 -#: builtin/submodule--helper.c:652
22449 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
22450 +#: builtin/submodule--helper.c:654
22451 #, c-format
22452 msgid "No url found for submodule path '%s' in .gitmodules"
22453 msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
22454
22450 -#: builtin/submodule--helper.c:524
22455 +#: builtin/submodule--helper.c:526
22456 #, c-format
22457 msgid "Entering '%s'\n"
22458 msgstr "Går in i \"%s\"\n"
22459
22455 -#: builtin/submodule--helper.c:527
22460 +#: builtin/submodule--helper.c:529
22461 #, c-format
22462 msgid ""
22463 "run_command returned non-zero status for %s\n"
@@ -22461,7 +22466,7 @@ msgstr ""
22466 "run_command returnerade icke-nollstatus för %s\n"
22467 "."
22468
22464 -#: builtin/submodule--helper.c:549
22469 +#: builtin/submodule--helper.c:551
22470 #, c-format
22471 msgid ""
22472 "run_command returned non-zero status while recursing in the nested "
@@ -22472,20 +22477,20 @@ msgstr ""
22477 "undermoduler för %s\n"
22478 "."
22479
22475 -#: builtin/submodule--helper.c:565
22480 +#: builtin/submodule--helper.c:567
22481 msgid "suppress output of entering each submodule command"
22482 msgstr "dölj utdata från för varje undermodulskommando som startas"
22483
22479 -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
22480 -#: builtin/submodule--helper.c:1487
22484 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
22485 +#: builtin/submodule--helper.c:1489
22486 msgid "recurse into nested submodules"
22487 msgstr "rekursera in i nästlade undermoduler"
22488
22484 -#: builtin/submodule--helper.c:572
22489 +#: builtin/submodule--helper.c:574
22490 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
22491 msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
22492
22488 -#: builtin/submodule--helper.c:599
22493 +#: builtin/submodule--helper.c:601
22494 #, c-format
22495 msgid ""
22496 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -22494,54 +22499,54 @@ msgstr ""
22499 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
22500 "officiella uppström."
22501
22497 -#: builtin/submodule--helper.c:666
22502 +#: builtin/submodule--helper.c:668
22503 #, c-format
22504 msgid "Failed to register url for submodule path '%s'"
22505 msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
22506
22502 -#: builtin/submodule--helper.c:670
22507 +#: builtin/submodule--helper.c:672
22508 #, c-format
22509 msgid "Submodule '%s' (%s) registered for path '%s'\n"
22510 msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
22511
22507 -#: builtin/submodule--helper.c:680
22512 +#: builtin/submodule--helper.c:682
22513 #, c-format
22514 msgid "warning: command update mode suggested for submodule '%s'\n"
22515 msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
22516
22512 -#: builtin/submodule--helper.c:687
22517 +#: builtin/submodule--helper.c:689
22518 #, c-format
22519 msgid "Failed to register update mode for submodule path '%s'"
22520 msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
22521
22517 -#: builtin/submodule--helper.c:709
22522 +#: builtin/submodule--helper.c:711
22523 msgid "suppress output for initializing a submodule"
22524 msgstr "dölj utdata från initiering av undermodul"
22525
22521 -#: builtin/submodule--helper.c:714
22526 +#: builtin/submodule--helper.c:716
22527 msgid "git submodule--helper init [<options>] [<path>]"
22528 msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
22529
22525 -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
22530 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
22531 #, c-format
22532 msgid "no submodule mapping found in .gitmodules for path '%s'"
22533 msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
22534
22530 -#: builtin/submodule--helper.c:835
22535 +#: builtin/submodule--helper.c:837
22536 #, c-format
22537 msgid "could not resolve HEAD ref inside the submodule '%s'"
22538 msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
22539
22535 -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
22540 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
22541 #, c-format
22542 msgid "failed to recurse into submodule '%s'"
22543 msgstr "misslyckades rekursera in i undermodulen \"%s\""
22544
22540 -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
22545 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
22546 msgid "suppress submodule status output"
22547 msgstr "hindra statusutskrift för undermodul"
22548
22544 -#: builtin/submodule--helper.c:887
22549 +#: builtin/submodule--helper.c:889
22550 msgid ""
22551 "use commit stored in the index instead of the one stored in the submodule "
22552 "HEAD"
@@ -22549,98 +22554,98 @@ msgstr ""
22554 "visa incheckning från indexet istället för den som lagrats i undermodulens "
22555 "HEAD"
22556
22552 -#: builtin/submodule--helper.c:893
22557 +#: builtin/submodule--helper.c:895
22558 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
22559 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
22560
22556 -#: builtin/submodule--helper.c:917
22561 +#: builtin/submodule--helper.c:919
22562 msgid "git submodule--helper name <path>"
22563 msgstr "git submodule--helper name <sökväg>"
22564
22560 -#: builtin/submodule--helper.c:989
22565 +#: builtin/submodule--helper.c:991
22566 #, c-format
22567 msgid "* %s %s(blob)->%s(submodule)"
22568 msgstr "* %s %s(blob)->%s(submodule)"
22569
22565 -#: builtin/submodule--helper.c:992
22570 +#: builtin/submodule--helper.c:994
22571 #, c-format
22572 msgid "* %s %s(submodule)->%s(blob)"
22573 msgstr "* %s %s(submodule)->%s(blob)"
22574
22570 -#: builtin/submodule--helper.c:1005
22575 +#: builtin/submodule--helper.c:1007
22576 #, c-format
22577 msgid "%s"
22578 msgstr "%s"
22579
22575 -#: builtin/submodule--helper.c:1055
22580 +#: builtin/submodule--helper.c:1057
22581 #, c-format
22582 msgid "couldn't hash object from '%s'"
22583 msgstr "kunde inte hasha objekt från \"%s\""
22584
22580 -#: builtin/submodule--helper.c:1059
22585 +#: builtin/submodule--helper.c:1061
22586 #, c-format
22587 msgid "unexpected mode %o\n"
22588 msgstr "okänt läge %o\n"
22589
22585 -#: builtin/submodule--helper.c:1300
22590 +#: builtin/submodule--helper.c:1302
22591 msgid "use the commit stored in the index instead of the submodule HEAD"
22592 msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD"
22593
22589 -#: builtin/submodule--helper.c:1302
22594 +#: builtin/submodule--helper.c:1304
22595 msgid "compare the commit in the index with that in the submodule HEAD"
22596 msgstr "jämför incheckningen i indexet med den i undermodulens HEAD"
22597
22593 -#: builtin/submodule--helper.c:1304
22598 +#: builtin/submodule--helper.c:1306
22599 msgid "skip submodules with 'ignore_config' value set to 'all'"
22600 msgstr ""
22601 "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\""
22602
22598 -#: builtin/submodule--helper.c:1306
22603 +#: builtin/submodule--helper.c:1308
22604 msgid "limit the summary size"
22605 msgstr "begränsa översiktsstorleken"
22606
22602 -#: builtin/submodule--helper.c:1311
22607 +#: builtin/submodule--helper.c:1313
22608 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
22609 msgstr ""
22610 "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
22611
22607 -#: builtin/submodule--helper.c:1335
22612 +#: builtin/submodule--helper.c:1337
22613 msgid "could not fetch a revision for HEAD"
22614 msgstr "kunde inte hämta en version för HEAD"
22615
22611 -#: builtin/submodule--helper.c:1340
22616 +#: builtin/submodule--helper.c:1342
22617 msgid "--cached and --files are mutually exclusive"
22618 msgstr "--cached och --files är ömsesidigt uteslutande"
22619
22615 -#: builtin/submodule--helper.c:1407
22620 +#: builtin/submodule--helper.c:1409
22621 #, c-format
22622 msgid "Synchronizing submodule url for '%s'\n"
22623 msgstr "Synkroniserar undermodul-url för \"%s\"\n"
22624
22620 -#: builtin/submodule--helper.c:1413
22625 +#: builtin/submodule--helper.c:1415
22626 #, c-format
22627 msgid "failed to register url for submodule path '%s'"
22628 msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
22629
22625 -#: builtin/submodule--helper.c:1427
22630 +#: builtin/submodule--helper.c:1429
22631 #, c-format
22632 msgid "failed to get the default remote for submodule '%s'"
22633 msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
22634
22630 -#: builtin/submodule--helper.c:1438
22635 +#: builtin/submodule--helper.c:1440
22636 #, c-format
22637 msgid "failed to update remote for submodule '%s'"
22638 msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
22639
22635 -#: builtin/submodule--helper.c:1485
22640 +#: builtin/submodule--helper.c:1487
22641 msgid "suppress output of synchronizing submodule url"
22642 msgstr "dölj utdata från synkronisering av undermodul-url"
22643
22639 -#: builtin/submodule--helper.c:1492
22644 +#: builtin/submodule--helper.c:1494
22645 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
22646 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
22647
22643 -#: builtin/submodule--helper.c:1546
22648 +#: builtin/submodule--helper.c:1548
22649 #, c-format
22650 msgid ""
22651 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22649,7 +22654,7 @@ msgstr ""
22654 "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
22655 "\" om du verkligen vill ta bort den och all dess historik)"
22656
22652 -#: builtin/submodule--helper.c:1558
22657 +#: builtin/submodule--helper.c:1560
22658 #, c-format
22659 msgid ""
22660 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22658,46 +22663,46 @@ msgstr ""
22663 "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
22664 "dem"
22665
22661 -#: builtin/submodule--helper.c:1566
22666 +#: builtin/submodule--helper.c:1568
22667 #, c-format
22668 msgid "Cleared directory '%s'\n"
22669 msgstr "Rensade katalogen \"%s\"\n"
22670
22666 -#: builtin/submodule--helper.c:1568
22671 +#: builtin/submodule--helper.c:1570
22672 #, c-format
22673 msgid "Could not remove submodule work tree '%s'\n"
22674 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
22675
22671 -#: builtin/submodule--helper.c:1579
22676 +#: builtin/submodule--helper.c:1581
22677 #, c-format
22678 msgid "could not create empty submodule directory %s"
22679 msgstr "kunde inte skapa tom undermodulskatalog %s"
22680
22676 -#: builtin/submodule--helper.c:1595
22681 +#: builtin/submodule--helper.c:1597
22682 #, c-format
22683 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
22684 msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
22685
22681 -#: builtin/submodule--helper.c:1624
22686 +#: builtin/submodule--helper.c:1626
22687 msgid "remove submodule working trees even if they contain local changes"
22688 msgstr ""
22689 "ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
22690
22686 -#: builtin/submodule--helper.c:1625
22691 +#: builtin/submodule--helper.c:1627
22692 msgid "unregister all submodules"
22693 msgstr "avregistrera alla undermoduler"
22694
22690 -#: builtin/submodule--helper.c:1630
22695 +#: builtin/submodule--helper.c:1632
22696 msgid ""
22697 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
22698 msgstr ""
22699 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
22700
22696 -#: builtin/submodule--helper.c:1644
22701 +#: builtin/submodule--helper.c:1646
22702 msgid "Use '--all' if you really want to deinitialize all submodules"
22703 msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
22704
22700 -#: builtin/submodule--helper.c:1713
22705 +#: builtin/submodule--helper.c:1690
22706 msgid ""
22707 "An alternate computed from a superproject's alternate is invalid.\n"
22708 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22709,46 +22714,67 @@ msgstr ""
22714 "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
22715 "med \"--reference-if-able\" istället för \"--reference\"."
22716
22712 -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
22717 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
22718 #, c-format
22719 msgid "submodule '%s' cannot add alternate: %s"
22720 msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
22721
22717 -#: builtin/submodule--helper.c:1791
22722 +#: builtin/submodule--helper.c:1768
22723 #, c-format
22724 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
22725 msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
22726
22722 -#: builtin/submodule--helper.c:1798
22727 +#: builtin/submodule--helper.c:1775
22728 #, c-format
22729 msgid "Value '%s' for submodule.alternateLocation is not recognized"
22730 msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
22731
22727 -#: builtin/submodule--helper.c:1822
22732 +#: builtin/submodule--helper.c:1800
22733 +#, c-format
22734 +msgid "refusing to create/use '%s' in another submodule's git dir"
22735 +msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
22736 +
22737 +#: builtin/submodule--helper.c:1841
22738 +#, c-format
22739 +msgid "clone of '%s' into submodule path '%s' failed"
22740 +msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
22741 +
22742 +#: builtin/submodule--helper.c:1846
22743 +#, c-format
22744 +msgid "directory not empty: '%s'"
22745 +msgstr "katalogen inte tom: \"%s\""
22746 +
22747 +#: builtin/submodule--helper.c:1858
22748 +#, c-format
22749 +msgid "could not get submodule directory for '%s'"
22750 +msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
22751 +
22752 +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
22753 msgid "where the new submodule will be cloned to"
22754 msgstr "var den nya undermodulen ska klonas till"
22755
22731 -#: builtin/submodule--helper.c:1825
22756 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
22757 msgid "name of the new submodule"
22758 msgstr "namn på den nya undermodulen"
22759
22735 -#: builtin/submodule--helper.c:1828
22760 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
22761 msgid "url where to clone the submodule from"
22762 msgstr "URL att klona undermodulen från"
22763
22739 -#: builtin/submodule--helper.c:1836
22764 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
22765 msgid "depth for shallow clones"
22766 msgstr "djup för grunda kloner"
22767
22743 -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
22768 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
22769 +#: builtin/submodule--helper.c:2909
22770 msgid "force cloning progress"
22771 msgstr "tvinga kloningsförlopp"
22772
22747 -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
22773 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
22774 msgid "disallow cloning into non-empty directory"
22775 msgstr "förhindra kloning till icke-tom katalog"
22776
22751 -#: builtin/submodule--helper.c:1848
22777 +#: builtin/submodule--helper.c:1916
22778 msgid ""
22779 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
22780 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22758,103 +22784,83 @@ msgstr ""
22784 "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
22785 "path <sökväg>"
22786
22761 -#: builtin/submodule--helper.c:1873
22762 -#, c-format
22763 -msgid "refusing to create/use '%s' in another submodule's git dir"
22764 -msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
22765 -
22766 -#: builtin/submodule--helper.c:1884
22767 -#, c-format
22768 -msgid "clone of '%s' into submodule path '%s' failed"
22769 -msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
22770 -
22771 -#: builtin/submodule--helper.c:1888
22772 -#, c-format
22773 -msgid "directory not empty: '%s'"
22774 -msgstr "katalogen inte tom: \"%s\""
22775 -
22776 -#: builtin/submodule--helper.c:1900
22777 -#, c-format
22778 -msgid "could not get submodule directory for '%s'"
22779 -msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
22780 -
22781 -#: builtin/submodule--helper.c:1936
22787 +#: builtin/submodule--helper.c:1953
22788 #, c-format
22789 msgid "Invalid update mode '%s' for submodule path '%s'"
22790 msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
22791
22786 -#: builtin/submodule--helper.c:1940
22792 +#: builtin/submodule--helper.c:1957
22793 #, c-format
22794 msgid "Invalid update mode '%s' configured for submodule path '%s'"
22795 msgstr ""
22796 "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
22797
22792 -#: builtin/submodule--helper.c:2041
22798 +#: builtin/submodule--helper.c:2058
22799 #, c-format
22800 msgid "Submodule path '%s' not initialized"
22801 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
22802
22797 -#: builtin/submodule--helper.c:2045
22803 +#: builtin/submodule--helper.c:2062
22804 msgid "Maybe you want to use 'update --init'?"
22805 msgstr "Kanske menade du att använda \"update --init\"?"
22806
22801 -#: builtin/submodule--helper.c:2075
22807 +#: builtin/submodule--helper.c:2092
22808 #, c-format
22809 msgid "Skipping unmerged submodule %s"
22810 msgstr "Hoppar över ej sammanslagen undermodul %s"
22811
22806 -#: builtin/submodule--helper.c:2104
22812 +#: builtin/submodule--helper.c:2121
22813 #, c-format
22814 msgid "Skipping submodule '%s'"
22815 msgstr "Hoppar över undermodulen \"%s\""
22816
22811 -#: builtin/submodule--helper.c:2254
22817 +#: builtin/submodule--helper.c:2271
22818 #, c-format
22819 msgid "Failed to clone '%s'. Retry scheduled"
22820 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
22821
22816 -#: builtin/submodule--helper.c:2265
22822 +#: builtin/submodule--helper.c:2282
22823 #, c-format
22824 msgid "Failed to clone '%s' a second time, aborting"
22825 msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
22826
22821 -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
22827 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
22828 msgid "path into the working tree"
22829 msgstr "sökväg inuti arbetskatalogen"
22830
22825 -#: builtin/submodule--helper.c:2330
22831 +#: builtin/submodule--helper.c:2347
22832 msgid "path into the working tree, across nested submodule boundaries"
22833 msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
22834
22829 -#: builtin/submodule--helper.c:2334
22835 +#: builtin/submodule--helper.c:2351
22836 msgid "rebase, merge, checkout or none"
22837 msgstr "rebase, merge, checkout eller none"
22838
22833 -#: builtin/submodule--helper.c:2340
22839 +#: builtin/submodule--helper.c:2357
22840 msgid "create a shallow clone truncated to the specified number of revisions"
22841 msgstr "skapa en grund klon trunkerad till angivet antal revisioner"
22842
22837 -#: builtin/submodule--helper.c:2343
22843 +#: builtin/submodule--helper.c:2360
22844 msgid "parallel jobs"
22845 msgstr "parallella jobb"
22846
22841 -#: builtin/submodule--helper.c:2345
22847 +#: builtin/submodule--helper.c:2362
22848 msgid "whether the initial clone should follow the shallow recommendation"
22849 msgstr "om den första klonen ska följa rekommendation för grund kloning"
22850
22845 -#: builtin/submodule--helper.c:2346
22851 +#: builtin/submodule--helper.c:2363
22852 msgid "don't print cloning progress"
22853 msgstr "skriv inte klonförlopp"
22854
22849 -#: builtin/submodule--helper.c:2357
22855 +#: builtin/submodule--helper.c:2374
22856 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
22857 msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
22858
22853 -#: builtin/submodule--helper.c:2370
22859 +#: builtin/submodule--helper.c:2387
22860 msgid "bad value for update parameter"
22861 msgstr "felaktigt värde för parametern update"
22862
22857 -#: builtin/submodule--helper.c:2418
22863 +#: builtin/submodule--helper.c:2435
22864 #, c-format
22865 msgid ""
22866 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22863,84 +22869,143 @@ msgstr ""
22869 "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
22870 "huvudprojektet är inte på någon gren"
22871
22866 -#: builtin/submodule--helper.c:2541
22872 +#: builtin/submodule--helper.c:2558
22873 #, c-format
22874 msgid "could not get a repository handle for submodule '%s'"
22875 msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
22876
22871 -#: builtin/submodule--helper.c:2574
22877 +#: builtin/submodule--helper.c:2591
22878 msgid "recurse into submodules"
22879 msgstr "rekursera ner i undermoduler"
22880
22875 -#: builtin/submodule--helper.c:2580
22881 +#: builtin/submodule--helper.c:2597
22882 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
22883 msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
22884
22879 -#: builtin/submodule--helper.c:2636
22885 +#: builtin/submodule--helper.c:2653
22886 msgid "check if it is safe to write to the .gitmodules file"
22887 msgstr "se om det är säkert att skriva till .gitmodules-filen"
22888
22883 -#: builtin/submodule--helper.c:2639
22889 +#: builtin/submodule--helper.c:2656
22890 msgid "unset the config in the .gitmodules file"
22891 msgstr "ta bort konfigurationen från .gitmodules-filen"
22892
22887 -#: builtin/submodule--helper.c:2644
22893 +#: builtin/submodule--helper.c:2661
22894 msgid "git submodule--helper config <name> [<value>]"
22895 msgstr "git submodule--helper config <namn> [<värde>]"
22896
22891 -#: builtin/submodule--helper.c:2645
22897 +#: builtin/submodule--helper.c:2662
22898 msgid "git submodule--helper config --unset <name>"
22899 msgstr "git submodule--helper config --unset <namn>"
22900
22895 -#: builtin/submodule--helper.c:2646
22901 +#: builtin/submodule--helper.c:2663
22902 msgid "git submodule--helper config --check-writeable"
22903 msgstr "git submodule--helper config --check-writeable"
22904
22899 -#: builtin/submodule--helper.c:2665 git-submodule.sh:150
22905 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150
22906 #, sh-format
22907 msgid "please make sure that the .gitmodules file is in the working tree"
22908 msgstr "se till att .gitmodules finns i arbetskatalogen"
22909
22904 -#: builtin/submodule--helper.c:2681
22910 +#: builtin/submodule--helper.c:2698
22911 msgid "suppress output for setting url of a submodule"
22912 msgstr "dölj utdata från inställning av url för undermodul"
22913
22908 -#: builtin/submodule--helper.c:2685
22914 +#: builtin/submodule--helper.c:2702
22915 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
22916 msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
22917
22912 -#: builtin/submodule--helper.c:2718
22918 +#: builtin/submodule--helper.c:2735
22919 msgid "set the default tracking branch to master"
22920 msgstr "välj master som förvald spårad gren"
22921
22916 -#: builtin/submodule--helper.c:2720
22922 +#: builtin/submodule--helper.c:2737
22923 msgid "set the default tracking branch"
22924 msgstr "välj förvald spårad gren"
22925
22920 -#: builtin/submodule--helper.c:2724
22926 +#: builtin/submodule--helper.c:2741
22927 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
22928 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>"
22929
22924 -#: builtin/submodule--helper.c:2725
22930 +#: builtin/submodule--helper.c:2742
22931 msgid ""
22932 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
22933 msgstr ""
22928 -"git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>"
22934 +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
22935
22930 -#: builtin/submodule--helper.c:2732
22936 +#: builtin/submodule--helper.c:2749
22937 msgid "--branch or --default required"
22938 msgstr "--branch eller --default krävs"
22939
22934 -#: builtin/submodule--helper.c:2735
22940 +#: builtin/submodule--helper.c:2752
22941 msgid "--branch and --default are mutually exclusive"
22942 msgstr "--branch och --default är ömsesidigt uteslutande"
22943
22938 -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
22944 +#: builtin/submodule--helper.c:2815
22945 +#, c-format
22946 +msgid "Adding existing repo at '%s' to the index\n"
22947 +msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
22948 +
22949 +#: builtin/submodule--helper.c:2818
22950 +#, c-format
22951 +msgid "'%s' already exists and is not a valid git repo"
22952 +msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
22953 +
22954 +#: builtin/submodule--helper.c:2828
22955 +#, c-format
22956 +msgid "A git directory for '%s' is found locally with remote(s):"
22957 +msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):"
22958 +
22959 +#: builtin/submodule--helper.c:2833
22960 +#, c-format
22961 +msgid ""
22962 +"If you want to reuse this local git directory instead of cloning again from\n"
22963 +" %s\n"
22964 +"use the '--force' option. If the local git directory is not the correct "
22965 +"repo\n"
22966 +"or if you are unsure what this means, choose another name with the '--name' "
22967 +"option.\n"
22968 +msgstr ""
22969 +"Om du vill återanvända den lokala git-katalogen istället för att klona på "
22970 +"nytt från\n"
22971 +" %s\n"
22972 +"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
22973 +"korrekt\n"
22974 +"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
22975 +"flaggan \"--name\".\n"
22976 +
22977 +#: builtin/submodule--helper.c:2842
22978 +#, c-format
22979 +msgid "Reactivating local git directory for submodule '%s'\n"
22980 +msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
22981 +
22982 +#: builtin/submodule--helper.c:2875
22983 +#, c-format
22984 +msgid "unable to checkout submodule '%s'"
22985 +msgstr "Kan inte checka ut undermodulen \"%s\""
22986 +
22987 +#: builtin/submodule--helper.c:2888
22988 +msgid "branch of repository to checkout on cloning"
22989 +msgstr "gren från arkivet att checka ut vid kloning"
22990 +
22991 +#: builtin/submodule--helper.c:2910
22992 +msgid "allow adding an otherwise ignored submodule path"
22993 +msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
22994 +
22995 +#: builtin/submodule--helper.c:2917
22996 +msgid ""
22997 +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
22998 +"name <name>"
22999 +msgstr ""
23000 +"git submodule--helper add-clone [<flaggor>...] --url <url> --path <sökväg> "
23001 +"--name <namn>"
23002 +
23003 +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
23004 #, c-format
23005 msgid "%s doesn't support --super-prefix"
23006 msgstr "%s stöder inte --super-prefix"
23007
22943 -#: builtin/submodule--helper.c:2798
23008 +#: builtin/submodule--helper.c:2991
23009 #, c-format
23010 msgid "'%s' is not a valid submodule--helper subcommand"
23011 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -23530,7 +23595,7 @@ msgstr "visa endast statistik"
23595
23596 #: builtin/verify-tag.c:18
23597 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
23533 -msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
23598 +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..."
23599
23600 #: builtin/verify-tag.c:36
23601 msgid "print tag contents"
@@ -25146,70 +25211,27 @@ msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
25211 msgid "'$sm_path' does not have a commit checked out"
25212 msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
25213
25149 -#: git-submodule.sh:249
25150 -#, sh-format
25151 -msgid "Adding existing repo at '$sm_path' to the index"
25152 -msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
25153 -
25154 -#: git-submodule.sh:251
25155 -#, sh-format
25156 -msgid "'$sm_path' already exists and is not a valid git repo"
25157 -msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
25158 -
25159 -#: git-submodule.sh:259
25160 -#, sh-format
25161 -msgid "A git directory for '$sm_name' is found locally with remote(s):"
25162 -msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
25163 -
25164 -#: git-submodule.sh:261
25165 -#, sh-format
25166 -msgid ""
25167 -"If you want to reuse this local git directory instead of cloning again from\n"
25168 -" $realrepo\n"
25169 -"use the '--force' option. If the local git directory is not the correct "
25170 -"repo\n"
25171 -"or you are unsure what this means choose another name with the '--name' "
25172 -"option."
25173 -msgstr ""
25174 -"Om du vill återanvända den lokala git-katalogen instället för att klona på "
25175 -"nytt från\n"
25176 -" $realrepo\n"
25177 -"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
25178 -"korrekt\n"
25179 -"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
25180 -"flaggan \"--name\"."
25181 -
25182 -#: git-submodule.sh:267
25183 -#, sh-format
25184 -msgid "Reactivating local git directory for submodule '$sm_name'."
25185 -msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
25186 -
25187 -#: git-submodule.sh:279
25188 -#, sh-format
25189 -msgid "Unable to checkout submodule '$sm_path'"
25190 -msgstr "Kan inte checka ut undermodulen \"$sm_path\""
25191 -
25192 -#: git-submodule.sh:284
25214 +#: git-submodule.sh:248
25215 #, sh-format
25216 msgid "Failed to add submodule '$sm_path'"
25217 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
25218
25197 -#: git-submodule.sh:293
25219 +#: git-submodule.sh:257
25220 #, sh-format
25221 msgid "Failed to register submodule '$sm_path'"
25222 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
25223
25202 -#: git-submodule.sh:568
25224 +#: git-submodule.sh:532
25225 #, sh-format
25226 msgid "Unable to find current revision in submodule path '$displaypath'"
25227 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
25228
25207 -#: git-submodule.sh:578
25229 +#: git-submodule.sh:542
25230 #, sh-format
25231 msgid "Unable to fetch in submodule path '$sm_path'"
25232 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
25233
25212 -#: git-submodule.sh:583
25234 +#: git-submodule.sh:547
25235 #, sh-format
25236 msgid ""
25237 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25218,7 +25240,7 @@ msgstr ""
25240 "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
25241 "undermodulsökvägen \"$sm_path\""
25242
25221 -#: git-submodule.sh:601
25243 +#: git-submodule.sh:565
25244 #, sh-format
25245 msgid ""
25246 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -25227,7 +25249,7 @@ msgstr ""
25249 "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
25250 "direkt:"
25251
25230 -#: git-submodule.sh:607
25252 +#: git-submodule.sh:571
25253 #, sh-format
25254 msgid ""
25255 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -25236,48 +25258,48 @@ msgstr ""
25258 "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
25259 "Direkt hämtning av incheckningen misslyckades."
25260
25239 -#: git-submodule.sh:614
25261 +#: git-submodule.sh:578
25262 #, sh-format
25263 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
25264 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
25265
25244 -#: git-submodule.sh:615
25266 +#: git-submodule.sh:579
25267 #, sh-format
25268 msgid "Submodule path '$displaypath': checked out '$sha1'"
25269 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
25270
25249 -#: git-submodule.sh:619
25271 +#: git-submodule.sh:583
25272 #, sh-format
25273 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
25274 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
25275
25254 -#: git-submodule.sh:620
25276 +#: git-submodule.sh:584
25277 #, sh-format
25278 msgid "Submodule path '$displaypath': rebased into '$sha1'"
25279 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
25280
25259 -#: git-submodule.sh:625
25281 +#: git-submodule.sh:589
25282 #, sh-format
25283 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
25284 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
25285
25264 -#: git-submodule.sh:626
25286 +#: git-submodule.sh:590
25287 #, sh-format
25288 msgid "Submodule path '$displaypath': merged in '$sha1'"
25289 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
25290
25269 -#: git-submodule.sh:631
25291 +#: git-submodule.sh:595
25292 #, sh-format
25293 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
25294 msgstr ""
25295 "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
25296
25275 -#: git-submodule.sh:632
25297 +#: git-submodule.sh:596
25298 #, sh-format
25299 msgid "Submodule path '$displaypath': '$command $sha1'"
25300 msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
25301
25280 -#: git-submodule.sh:663
25302 +#: git-submodule.sh:627
25303 #, sh-format
25304 msgid "Failed to recurse into submodule path '$displaypath'"
25305 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
@@ -26028,7 +26050,7 @@ msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
26050
26051 #: git-send-email.perl:450
26052 msgid "--dump-aliases incompatible with other options\n"
26031 -msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
26053 +msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
26054
26055 #: git-send-email.perl:525
26056 msgid ""