@matheusbsbs / matheus-bagliano / commits / eec16a65ee

l10n: Update Swedish translation (1983t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

Peter Krefting committed Jan 27, 2013 at 22:38 UTC eec16a65eee90be80be6aac487bfdffdccd9b0d5
1 file changed +601 -563
po/sv.po
+601 -563
@@ -1,14 +1,14 @@
1 # Swedish translations for Git.
2 -# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se>
2 +# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se>
3 # This file is distributed under the same license as the Git package.
4 -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012.
4 +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013.
5 #
6 msgid ""
7 msgstr ""
8 "Project-Id-Version: git 1.8.1\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2012-11-30 12:40+0800\n"
11 -"PO-Revision-Date: 2012-11-30 10:49+0100\n"
10 +"POT-Creation-Date: 2013-01-25 12:33+0800\n"
11 +"PO-Revision-Date: 2013-01-27 22:36+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"
@@ -17,7 +17,7 @@ msgstr ""
17 "Content-Transfer-Encoding: 8bit\n"
18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
20 -#: advice.c:40
20 +#: advice.c:45
21 #, c-format
22 msgid "hint: %.*s\n"
23 msgstr "tips: %.*s\n"
@@ -26,7 +26,7 @@ msgstr "tips: %.*s\n"
26 #. * Message used both when 'git commit' fails and when
27 #. * other commands doing a merge do.
28 #.
29 -#: advice.c:70
29 +#: advice.c:75
30 msgid ""
31 "Fix them up in the work tree,\n"
32 "and then use 'git add/rm <file>' as\n"
@@ -57,71 +57,71 @@ msgstr ""
57 msgid "git archive --remote <repo> [--exec <cmd>] --list"
58 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
59
60 -#: archive.c:322
60 +#: archive.c:323
61 msgid "fmt"
62 msgstr "fmt"
63
64 -#: archive.c:322
64 +#: archive.c:323
65 msgid "archive format"
66 msgstr "arkivformat"
67
68 -#: archive.c:323 builtin/log.c:1084
68 +#: archive.c:324 builtin/log.c:1115
69 msgid "prefix"
70 msgstr "prefix"
71
72 -#: archive.c:324
72 +#: archive.c:325
73 msgid "prepend prefix to each pathname in the archive"
74 msgstr "lägg till prefix till varje sökväg i arkivet"
75
76 -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390
77 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642
78 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77
76 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380
77 +#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653
78 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
79 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
80 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
81 msgid "file"
82 msgstr "fil"
83
84 -#: archive.c:326 builtin/archive.c:92
84 +#: archive.c:327 builtin/archive.c:92
85 msgid "write the archive to this file"
86 msgstr "skriv arkivet till filen"
87
88 -#: archive.c:328
88 +#: archive.c:329
89 msgid "read .gitattributes in working directory"
90 msgstr "läs .gitattributes i arbetskatalogen"
91
92 -#: archive.c:329
92 +#: archive.c:330
93 msgid "report archived files on stderr"
94 msgstr "rapportera arkiverade filer på standard fel"
95
96 -#: archive.c:330
96 +#: archive.c:331
97 msgid "store only"
98 msgstr "endast spara"
99
100 -#: archive.c:331
100 +#: archive.c:332
101 msgid "compress faster"
102 msgstr "komprimera snabbare"
103
104 -#: archive.c:339
104 +#: archive.c:340
105 msgid "compress better"
106 msgstr "komprimera bättre"
107
108 -#: archive.c:342
108 +#: archive.c:343
109 msgid "list supported archive formats"
110 msgstr "visa understödda arkivformat"
111
112 -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85
112 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85
113 msgid "repo"
114 msgstr "arkiv"
115
116 -#: archive.c:345 builtin/archive.c:94
116 +#: archive.c:346 builtin/archive.c:94
117 msgid "retrieve the archive from remote repository <repo>"
118 msgstr "hämta arkivet från fjärrarkivet <arkiv>"
119
120 -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
120 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619
121 msgid "command"
122 msgstr "kommando"
123
124 -#: archive.c:347 builtin/archive.c:96
124 +#: archive.c:348 builtin/archive.c:96
125 msgid "path to the remote git-upload-archive command"
126 msgstr "sökväg till kommandot git-upload-archive på fjärren"
127
@@ -152,9 +152,9 @@ msgstr "kunde inte öppna \"%s\""
152 msgid "Repository lacks these prerequisite commits:"
153 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
154
155 -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
156 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347
157 -#: builtin/shortlog.c:181
155 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
156 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
157 +#: builtin/shortlog.c:157
158 msgid "revision walk setup failed"
159 msgstr "misslyckades skapa revisionstraversering"
160
@@ -180,7 +180,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"
180 msgid "rev-list died"
181 msgstr "rev-list dog"
182
183 -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284
183 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
184 #, c-format
185 msgid "unrecognized argument: %s"
186 msgstr "okänt argument: %s"
@@ -614,7 +614,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
614 msgid "Auto-merging %s"
615 msgstr "Slår ihop %s automatiskt"
616
617 -#: merge-recursive.c:1633 git-submodule.sh:893
617 +#: merge-recursive.c:1633 git-submodule.sh:942
618 msgid "submodule"
619 msgstr "undermodul"
620
@@ -689,39 +689,39 @@ msgstr "Kunde inte tolka objektet \"%s\""
689 msgid "Unable to write index."
690 msgstr "Kunde inte skriva indexet."
691
692 -#: parse-options.c:494
692 +#: parse-options.c:485
693 msgid "..."
694 msgstr "..."
695
696 -#: parse-options.c:512
696 +#: parse-options.c:503
697 #, c-format
698 msgid "usage: %s"
699 msgstr "användning: %s"
700
701 #. TRANSLATORS: the colon here should align with the
702 #. one in "usage: %s" translation
703 -#: parse-options.c:516
703 +#: parse-options.c:507
704 #, c-format
705 msgid " or: %s"
706 msgstr " eller: %s"
707
708 -#: parse-options.c:519
708 +#: parse-options.c:510
709 #, c-format
710 msgid " %s"
711 msgstr " %s"
712
713 -#: remote.c:1632
713 +#: remote.c:1686
714 #, c-format
715 msgid "Your branch is ahead of '%s' by %d commit.\n"
716 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
717 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
718 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
719
720 -#: remote.c:1637
720 +#: remote.c:1692
721 msgid " (use \"git push\" to publish your local commits)\n"
722 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
723
724 -#: remote.c:1640
724 +#: remote.c:1695
725 #, c-format
726 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
727 msgid_plural ""
@@ -731,11 +731,11 @@ msgstr[0] ""
731 msgstr[1] ""
732 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
733
734 -#: remote.c:1647
734 +#: remote.c:1703
735 msgid " (use \"git pull\" to update your local branch)\n"
736 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
737
738 -#: remote.c:1650
738 +#: remote.c:1706
739 #, c-format
740 msgid ""
741 "Your branch and '%s' have diverged,\n"
@@ -750,18 +750,18 @@ msgstr[1] ""
750 "Din gren och \"%s\" har divergerat,\n"
751 "och har %d respektive %d olika incheckningar.\n"
752
753 -#: remote.c:1659
753 +#: remote.c:1716
754 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
755 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
756
757 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
758 -#: builtin/merge.c:994
757 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985
758 +#: builtin/merge.c:995
759 #, c-format
760 msgid "Could not open '%s' for writing"
761 msgstr "Kunde inte öppna \"%s\" för skrivning"
762
763 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
764 -#: builtin/merge.c:999
763 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987
764 +#: builtin/merge.c:1000
765 #, c-format
766 msgid "Could not write to '%s'"
767 msgstr "Kunde inte skriva till \"%s\""
@@ -784,7 +784,7 @@ msgstr ""
784 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
785 "och checka in resultatet med \"git commit\""
786
787 -#: sequencer.c:162 sequencer.c:770 sequencer.c:853
787 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857
788 #, c-format
789 msgid "Could not write to %s"
790 msgstr "Kunde inte skriva till %s"
@@ -807,191 +807,187 @@ msgid "Commit your changes or stash them to proceed."
807 msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
808
809 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
810 -#: sequencer.c:235
810 +#: sequencer.c:236
811 #, c-format
812 msgid "%s: Unable to write new index file"
813 msgstr "%s: Kunde inte skriva ny indexfil"
814
815 -#: sequencer.c:266
815 +#: sequencer.c:267
816 msgid "Could not resolve HEAD commit\n"
817 msgstr "Kunde inte bestämma HEAD:s incheckning\n"
818
819 -#: sequencer.c:287
819 +#: sequencer.c:288
820 msgid "Unable to update cache tree\n"
821 msgstr "Kan inte uppdatera cacheträd\n"
822
823 -#: sequencer.c:332
823 +#: sequencer.c:333
824 #, c-format
825 msgid "Could not parse commit %s\n"
826 msgstr "Kunde inte tolka incheckningen %s\n"
827
828 -#: sequencer.c:337
828 +#: sequencer.c:338
829 #, c-format
830 msgid "Could not parse parent commit %s\n"
831 msgstr "Kunde inte tolka föräldraincheckningen %s\n"
832
833 -#: sequencer.c:403
833 +#: sequencer.c:404
834 msgid "Your index file is unmerged."
835 msgstr "Din indexfil har inte slagits ihop."
836
837 -#: sequencer.c:406
838 -msgid "You do not have a valid HEAD"
839 -msgstr "Du har ingen giltig HEAD"
840 -
841 -#: sequencer.c:421
837 +#: sequencer.c:423
838 #, c-format
839 msgid "Commit %s is a merge but no -m option was given."
840 msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
841
846 -#: sequencer.c:429
842 +#: sequencer.c:431
843 #, c-format
844 msgid "Commit %s does not have parent %d"
845 msgstr "Incheckning %s har inte förälder %d"
846
851 -#: sequencer.c:433
847 +#: sequencer.c:435
848 #, c-format
849 msgid "Mainline was specified but commit %s is not a merge."
850 msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
851
852 #. TRANSLATORS: The first %s will be "revert" or
853 #. "cherry-pick", the second %s a SHA1
858 -#: sequencer.c:444
854 +#: sequencer.c:448
855 #, c-format
856 msgid "%s: cannot parse parent commit %s"
857 msgstr "%s: kan inte tolka föräldraincheckningen %s"
858
863 -#: sequencer.c:448
859 +#: sequencer.c:452
860 #, c-format
861 msgid "Cannot get commit message for %s"
862 msgstr "Kan inte hämta incheckningsmeddelande för %s"
863
868 -#: sequencer.c:532
864 +#: sequencer.c:536
865 #, c-format
866 msgid "could not revert %s... %s"
867 msgstr "kunde inte ångra %s... %s"
868
873 -#: sequencer.c:533
869 +#: sequencer.c:537
870 #, c-format
871 msgid "could not apply %s... %s"
872 msgstr "kunde inte tillämpa %s... %s"
873
878 -#: sequencer.c:565
874 +#: sequencer.c:569
875 msgid "empty commit set passed"
876 msgstr "den angivna uppsättningen incheckningar är tom"
877
882 -#: sequencer.c:573
878 +#: sequencer.c:577
879 #, c-format
880 msgid "git %s: failed to read the index"
881 msgstr "git %s: misslyckades läsa indexet"
882
887 -#: sequencer.c:578
883 +#: sequencer.c:582
884 #, c-format
885 msgid "git %s: failed to refresh the index"
886 msgstr "git %s: misslyckades uppdatera indexet"
887
892 -#: sequencer.c:636
888 +#: sequencer.c:640
889 #, c-format
890 msgid "Cannot %s during a %s"
891 msgstr "kan inte %s under en %s"
892
897 -#: sequencer.c:658
893 +#: sequencer.c:662
894 #, c-format
895 msgid "Could not parse line %d."
896 msgstr "Kan inte tolka rad %d."
897
902 -#: sequencer.c:663
898 +#: sequencer.c:667
899 msgid "No commits parsed."
900 msgstr "Inga incheckningar lästes."
901
906 -#: sequencer.c:676
902 +#: sequencer.c:680
903 #, c-format
904 msgid "Could not open %s"
905 msgstr "Kunde inte öppna %s"
906
911 -#: sequencer.c:680
907 +#: sequencer.c:684
908 #, c-format
909 msgid "Could not read %s."
910 msgstr "kunde inte läsa %s."
911
916 -#: sequencer.c:687
912 +#: sequencer.c:691
913 #, c-format
914 msgid "Unusable instruction sheet: %s"
915 msgstr "Oanvändbart manus: %s"
916
921 -#: sequencer.c:715
917 +#: sequencer.c:719
918 #, c-format
919 msgid "Invalid key: %s"
920 msgstr "Felaktig nyckel: %s"
921
926 -#: sequencer.c:718
922 +#: sequencer.c:722
923 #, c-format
924 msgid "Invalid value for %s: %s"
925 msgstr "Felaktigt värde för %s: %s"
926
931 -#: sequencer.c:730
927 +#: sequencer.c:734
928 #, c-format
929 msgid "Malformed options sheet: %s"
930 msgstr "Trasigt manus: %s"
931
936 -#: sequencer.c:751
932 +#: sequencer.c:755
933 msgid "a cherry-pick or revert is already in progress"
934 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
935
940 -#: sequencer.c:752
936 +#: sequencer.c:756
937 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
938 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
939
944 -#: sequencer.c:756
940 +#: sequencer.c:760
941 #, c-format
942 msgid "Could not create sequencer directory %s"
943 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
944
949 -#: sequencer.c:772 sequencer.c:857
945 +#: sequencer.c:776 sequencer.c:861
946 #, c-format
947 msgid "Error wrapping up %s."
948 msgstr "Fel vid ombrytning av %s."
949
954 -#: sequencer.c:791 sequencer.c:925
950 +#: sequencer.c:795 sequencer.c:929
951 msgid "no cherry-pick or revert in progress"
952 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
953
958 -#: sequencer.c:793
954 +#: sequencer.c:797
955 msgid "cannot resolve HEAD"
956 msgstr "kan inte bestämma HEAD"
957
962 -#: sequencer.c:795
958 +#: sequencer.c:799
959 msgid "cannot abort from a branch yet to be born"
960 msgstr "kan inte avbryta från en gren som ännu inte är född"
961
966 -#: sequencer.c:817 builtin/apply.c:4005
962 +#: sequencer.c:821 builtin/apply.c:4016
963 #, c-format
964 msgid "cannot open %s: %s"
965 msgstr "kan inte öppna %s: %s"
966
971 -#: sequencer.c:820
967 +#: sequencer.c:824
968 #, c-format
969 msgid "cannot read %s: %s"
970 msgstr "kan inte läsa %s: %s"
971
976 -#: sequencer.c:821
972 +#: sequencer.c:825
973 msgid "unexpected end of file"
974 msgstr "oväntat filslut"
975
980 -#: sequencer.c:827
976 +#: sequencer.c:831
977 #, c-format
978 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
979 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
980
985 -#: sequencer.c:850
981 +#: sequencer.c:854
982 #, c-format
983 msgid "Could not format %s."
984 msgstr "Kunde inte formatera %s."
985
990 -#: sequencer.c:1012
986 +#: sequencer.c:1016
987 msgid "Can't revert as initial commit"
988 msgstr "Kan inte ångra som första incheckning"
989
994 -#: sequencer.c:1013
990 +#: sequencer.c:1017
991 msgid "Can't cherry-pick into empty head"
992 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
993
@@ -1019,12 +1015,17 @@ msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
1015 msgid "unable to access '%s': %s"
1016 msgstr "kan inte komma åt \"%s\": %s"
1017
1022 -#: wrapper.c:426
1018 +#: wrapper.c:423
1019 +#, c-format
1020 +msgid "unable to access '%s'"
1021 +msgstr "kan inte komma åt \"%s\""
1022 +
1023 +#: wrapper.c:434
1024 #, c-format
1025 msgid "unable to look up current user in the passwd file: %s"
1026 msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
1027
1027 -#: wrapper.c:427
1028 +#: wrapper.c:435
1029 msgid "no such user"
1030 msgstr "okänd användare"
1031
@@ -1178,148 +1179,148 @@ msgstr "osammansl.: %s"
1179 msgid "bug: unhandled diff status %c"
1180 msgstr "programfel: diff-status %c ej hanterad"
1181
1181 -#: wt-status.c:785
1182 +#: wt-status.c:787
1183 msgid "You have unmerged paths."
1184 msgstr "Du har ej sammanslagna sökvägar."
1185
1185 -#: wt-status.c:788 wt-status.c:912
1186 +#: wt-status.c:790 wt-status.c:914
1187 msgid " (fix conflicts and run \"git commit\")"
1188 msgstr " (rätta konflikter och kör \"git commit\")"
1189
1189 -#: wt-status.c:791
1190 +#: wt-status.c:793
1191 msgid "All conflicts fixed but you are still merging."
1192 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
1193
1193 -#: wt-status.c:794
1194 +#: wt-status.c:796
1195 msgid " (use \"git commit\" to conclude merge)"
1196 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
1197
1197 -#: wt-status.c:804
1198 +#: wt-status.c:806
1199 msgid "You are in the middle of an am session."
1200 msgstr "Du är i mitten av en körning av \"git am\"."
1201
1201 -#: wt-status.c:807
1202 +#: wt-status.c:809
1203 msgid "The current patch is empty."
1204 msgstr "Aktuell patch är tom."
1205
1205 -#: wt-status.c:811
1206 +#: wt-status.c:813
1207 msgid " (fix conflicts and then run \"git am --resolved\")"
1208 msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
1209
1209 -#: wt-status.c:813
1210 +#: wt-status.c:815
1211 msgid " (use \"git am --skip\" to skip this patch)"
1212 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
1213
1213 -#: wt-status.c:815
1214 +#: wt-status.c:817
1215 msgid " (use \"git am --abort\" to restore the original branch)"
1216 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
1217
1217 -#: wt-status.c:873 wt-status.c:883
1218 +#: wt-status.c:875 wt-status.c:885
1219 msgid "You are currently rebasing."
1220 msgstr "Du håller på med en ombasering."
1221
1221 -#: wt-status.c:876
1222 +#: wt-status.c:878
1223 msgid " (fix conflicts and then run \"git rebase --continue\")"
1224 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
1225
1225 -#: wt-status.c:878
1226 +#: wt-status.c:880
1227 msgid " (use \"git rebase --skip\" to skip this patch)"
1228 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
1229
1229 -#: wt-status.c:880
1230 +#: wt-status.c:882
1231 msgid " (use \"git rebase --abort\" to check out the original branch)"
1232 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
1233
1233 -#: wt-status.c:886
1234 +#: wt-status.c:888
1235 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1236 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
1237
1237 -#: wt-status.c:888
1238 +#: wt-status.c:890
1239 msgid "You are currently splitting a commit during a rebase."
1240 msgstr "Du håller på att dela upp en incheckning i en ombasering."
1241
1241 -#: wt-status.c:891
1242 +#: wt-status.c:893
1243 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1244 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
1245
1245 -#: wt-status.c:893
1246 +#: wt-status.c:895
1247 msgid "You are currently editing a commit during a rebase."
1248 msgstr "Du håller på att redigera en incheckning under en ombasering."
1249
1249 -#: wt-status.c:896
1250 +#: wt-status.c:898
1251 msgid " (use \"git commit --amend\" to amend the current commit)"
1252 msgstr ""
1253 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
1254
1254 -#: wt-status.c:898
1255 +#: wt-status.c:900
1256 msgid ""
1257 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1258 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
1259
1259 -#: wt-status.c:908
1260 +#: wt-status.c:910
1261 msgid "You are currently cherry-picking."
1262 msgstr "Du håller på med en \"cherry-pick\"."
1263
1263 -#: wt-status.c:915
1264 +#: wt-status.c:917
1265 msgid " (all conflicts fixed: run \"git commit\")"
1266 msgstr " (alla konflikter har rättats: kör \"git commit\")"
1267
1267 -#: wt-status.c:924
1268 +#: wt-status.c:926
1269 msgid "You are currently bisecting."
1270 msgstr "Du håller på med en \"bisect\"."
1271
1271 -#: wt-status.c:927
1272 +#: wt-status.c:929
1273 msgid " (use \"git bisect reset\" to get back to the original branch)"
1274 msgstr ""
1275 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
1276
1276 -#: wt-status.c:978
1277 +#: wt-status.c:980
1278 msgid "On branch "
1279 msgstr "På grenen "
1280
1280 -#: wt-status.c:985
1281 +#: wt-status.c:987
1282 msgid "Not currently on any branch."
1283 msgstr "Inte på någon gren för närvarande."
1284
1284 -#: wt-status.c:997
1285 +#: wt-status.c:999
1286 msgid "Initial commit"
1287 msgstr "Första incheckning"
1288
1288 -#: wt-status.c:1011
1289 +#: wt-status.c:1013
1290 msgid "Untracked files"
1291 msgstr "Ospårade filer"
1292
1292 -#: wt-status.c:1013
1293 +#: wt-status.c:1015
1294 msgid "Ignored files"
1295 msgstr "Ignorerade filer"
1296
1297 # %s är nästa sträng eller tom.
1297 -#: wt-status.c:1015
1298 +#: wt-status.c:1017
1299 #, c-format
1300 msgid "Untracked files not listed%s"
1301 msgstr "Ospårade filer visas ej%s"
1302
1302 -#: wt-status.c:1017
1303 +#: wt-status.c:1019
1304 msgid " (use -u option to show untracked files)"
1305 msgstr " (använd flaggan -u för att visa ospårade filer)"
1306
1306 -#: wt-status.c:1023
1307 +#: wt-status.c:1025
1308 msgid "No changes"
1309 msgstr "Inga ändringar"
1310
1310 -#: wt-status.c:1028
1311 +#: wt-status.c:1030
1312 #, c-format
1313 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1314 msgstr ""
1315 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
1316 "\")\n"
1317
1317 -#: wt-status.c:1031
1318 +#: wt-status.c:1033
1319 #, c-format
1320 msgid "no changes added to commit\n"
1321 msgstr "inga ändringar att checka in\n"
1322
1322 -#: wt-status.c:1034
1323 +#: wt-status.c:1036
1324 #, c-format
1325 msgid ""
1326 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -1328,56 +1329,51 @@ msgstr ""
1329 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
1330 "\")\n"
1331
1331 -#: wt-status.c:1037
1332 +#: wt-status.c:1039
1333 #, c-format
1334 msgid "nothing added to commit but untracked files present\n"
1335 msgstr "inget köat för incheckning, men ospårade filer finns\n"
1336
1336 -#: wt-status.c:1040
1337 +#: wt-status.c:1042
1338 #, c-format
1339 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1340 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
1341
1341 -#: wt-status.c:1043 wt-status.c:1048
1342 +#: wt-status.c:1045 wt-status.c:1050
1343 #, c-format
1344 msgid "nothing to commit\n"
1345 msgstr "inget att checka in\n"
1346
1346 -#: wt-status.c:1046
1347 +#: wt-status.c:1048
1348 #, c-format
1349 msgid "nothing to commit (use -u to show untracked files)\n"
1350 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
1351
1351 -#: wt-status.c:1050
1352 +#: wt-status.c:1052
1353 #, c-format
1354 msgid "nothing to commit, working directory clean\n"
1355 msgstr "inget att checka in, arbetskatalogen ren\n"
1356
1356 -#: wt-status.c:1158
1357 +#: wt-status.c:1160
1358 msgid "HEAD (no branch)"
1359 msgstr "HEAD (ingen gren)"
1360
1360 -#: wt-status.c:1164
1361 +#: wt-status.c:1166
1362 msgid "Initial commit on "
1363 msgstr "Första incheckning på "
1364
1364 -#: wt-status.c:1179
1365 +#: wt-status.c:1181
1366 msgid "behind "
1367 msgstr "efter "
1368
1368 -#: wt-status.c:1182 wt-status.c:1185
1369 +#: wt-status.c:1184 wt-status.c:1187
1370 msgid "ahead "
1371 msgstr "före "
1372
1372 -#: wt-status.c:1187
1373 +#: wt-status.c:1189
1374 msgid ", behind "
1375 msgstr ", efter "
1376
1376 -#: compat/precompose_utf8.c:58 builtin/clone.c:341
1377 -#, c-format
1378 -msgid "failed to unlink '%s'"
1379 -msgstr "misslyckades ta bort länken \"%s\""
1380 -
1377 #: builtin/add.c:19
1378 msgid "git add [options] [--] <filepattern>..."
1379 msgstr "git add [flaggor] [--] <filmönster>..."
@@ -1446,14 +1442,14 @@ msgstr "Kunde inte tillämpa \"%s\""
1442 msgid "The following paths are ignored by one of your .gitignore files:\n"
1443 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
1444
1449 -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1450 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1445 +#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63
1446 +#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253
1447 #: builtin/rm.c:206
1448 msgid "dry run"
1449 msgstr "testkörning"
1450
1455 -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160
1456 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483
1451 +#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160
1452 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522
1453 #: builtin/mv.c:62 builtin/read-tree.c:112
1454 msgid "be verbose"
1455 msgstr "var pratsam"
@@ -1462,7 +1458,7 @@ msgstr "var pratsam"
1458 msgid "interactive picking"
1459 msgstr "plocka interaktivt"
1460
1465 -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248
1461 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258
1462 msgid "select hunks interactively"
1463 msgstr "välj stycken interaktivt"
1464
@@ -1529,12 +1525,12 @@ msgstr "Inget angivet, inget tillagt.\n"
1525 msgid "Maybe you wanted to say 'git add .'?\n"
1526 msgstr "Kanske menade du att skriva \"git add .\"?\n"
1527
1532 -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82
1528 +#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82
1529 #: builtin/rm.c:235
1530 msgid "index file corrupt"
1531 msgstr "indexfilen trasig"
1532
1537 -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370
1533 +#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370
1534 msgid "Unable to write new index file"
1535 msgstr "Kunde inte skriva ny indexfil"
1536
@@ -1667,28 +1663,24 @@ msgstr "kunde inte läsa symboliska länken %s"
1663 msgid "unable to open or read %s"
1664 msgstr "kunde inte öppna eller läsa %s"
1665
1670 -#: builtin/apply.c:2149
1671 -msgid "oops"
1672 -msgstr "hoppsan"
1673 -
1674 -#: builtin/apply.c:2671
1666 +#: builtin/apply.c:2682
1667 #, c-format
1668 msgid "invalid start of line: '%c'"
1669 msgstr "felaktig inledning på rad: \"%c\""
1670
1679 -#: builtin/apply.c:2789
1671 +#: builtin/apply.c:2800
1672 #, c-format
1673 msgid "Hunk #%d succeeded at %d (offset %d line)."
1674 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1675 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
1676 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
1677
1686 -#: builtin/apply.c:2801
1678 +#: builtin/apply.c:2812
1679 #, c-format
1680 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1681 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
1682
1691 -#: builtin/apply.c:2807
1683 +#: builtin/apply.c:2818
1684 #, c-format
1685 msgid ""
1686 "while searching for:\n"
@@ -1697,318 +1689,318 @@ msgstr ""
1689 "vid sökning efter:\n"
1690 "%.*s"
1691
1700 -#: builtin/apply.c:2826
1692 +#: builtin/apply.c:2837
1693 #, c-format
1694 msgid "missing binary patch data for '%s'"
1695 msgstr "saknar binära patchdata för \"%s\""
1696
1705 -#: builtin/apply.c:2929
1697 +#: builtin/apply.c:2940
1698 #, c-format
1699 msgid "binary patch does not apply to '%s'"
1700 msgstr "binärpatchen kan inte tillämpas på \"%s\""
1701
1710 -#: builtin/apply.c:2935
1702 +#: builtin/apply.c:2946
1703 #, c-format
1704 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1705 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
1706
1715 -#: builtin/apply.c:2956
1707 +#: builtin/apply.c:2967
1708 #, c-format
1709 msgid "patch failed: %s:%ld"
1710 msgstr "patch misslyckades: %s:%ld"
1711
1720 -#: builtin/apply.c:3078
1712 +#: builtin/apply.c:3089
1713 #, c-format
1714 msgid "cannot checkout %s"
1715 msgstr "kan inte checka ut %s"
1716
1725 -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176
1717 +#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187
1718 #, c-format
1719 msgid "read of %s failed"
1720 msgstr "misslyckades läsa %s"
1721
1730 -#: builtin/apply.c:3156 builtin/apply.c:3378
1722 +#: builtin/apply.c:3167 builtin/apply.c:3389
1723 #, c-format
1724 msgid "path %s has been renamed/deleted"
1725 msgstr "sökvägen %s har ändrat namn/tagits bort"
1726
1735 -#: builtin/apply.c:3237 builtin/apply.c:3392
1727 +#: builtin/apply.c:3248 builtin/apply.c:3403
1728 #, c-format
1729 msgid "%s: does not exist in index"
1730 msgstr "%s: finns inte i indexet"
1731
1740 -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406
1732 +#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417
1733 #, c-format
1734 msgid "%s: %s"
1735 msgstr "%s: %s"
1736
1745 -#: builtin/apply.c:3246 builtin/apply.c:3400
1737 +#: builtin/apply.c:3257 builtin/apply.c:3411
1738 #, c-format
1739 msgid "%s: does not match index"
1740 msgstr "%s: motsvarar inte indexet"
1741
1750 -#: builtin/apply.c:3348
1742 +#: builtin/apply.c:3359
1743 msgid "removal patch leaves file contents"
1744 msgstr "patch för borttagning lämnar kvar filinnehåll"
1745
1754 -#: builtin/apply.c:3417
1746 +#: builtin/apply.c:3428
1747 #, c-format
1748 msgid "%s: wrong type"
1749 msgstr "%s: fel typ"
1750
1759 -#: builtin/apply.c:3419
1751 +#: builtin/apply.c:3430
1752 #, c-format
1753 msgid "%s has type %o, expected %o"
1754 msgstr "%s har typen %o, förväntade %o"
1755
1764 -#: builtin/apply.c:3520
1756 +#: builtin/apply.c:3531
1757 #, c-format
1758 msgid "%s: already exists in index"
1759 msgstr "%s: finns redan i indexet"
1760
1769 -#: builtin/apply.c:3523
1761 +#: builtin/apply.c:3534
1762 #, c-format
1763 msgid "%s: already exists in working directory"
1764 msgstr "%s: finns redan i arbetskatalogen"
1765
1774 -#: builtin/apply.c:3543
1766 +#: builtin/apply.c:3554
1767 #, c-format
1768 msgid "new mode (%o) of %s does not match old mode (%o)"
1769 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
1770
1779 -#: builtin/apply.c:3548
1771 +#: builtin/apply.c:3559
1772 #, c-format
1773 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1774 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
1775
1784 -#: builtin/apply.c:3556
1776 +#: builtin/apply.c:3567
1777 #, c-format
1778 msgid "%s: patch does not apply"
1779 msgstr "%s: patchen kan inte tillämpas"
1780
1789 -#: builtin/apply.c:3569
1781 +#: builtin/apply.c:3580
1782 #, c-format
1783 msgid "Checking patch %s..."
1784 msgstr "Kontrollerar patchen %s..."
1785
1794 -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158
1786 +#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124
1787 #, c-format
1788 msgid "make_cache_entry failed for path '%s'"
1789 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
1790
1799 -#: builtin/apply.c:3767
1791 +#: builtin/apply.c:3778
1792 #, c-format
1793 msgid "unable to remove %s from index"
1794 msgstr "kan inte ta bort %s från indexet"
1795
1804 -#: builtin/apply.c:3795
1796 +#: builtin/apply.c:3806
1797 #, c-format
1798 msgid "corrupt patch for subproject %s"
1799 msgstr "trasig patch för underprojektet %s"
1800
1809 -#: builtin/apply.c:3799
1801 +#: builtin/apply.c:3810
1802 #, c-format
1803 msgid "unable to stat newly created file '%s'"
1804 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
1805
1814 -#: builtin/apply.c:3804
1806 +#: builtin/apply.c:3815
1807 #, c-format
1808 msgid "unable to create backing store for newly created file %s"
1809 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
1810
1819 -#: builtin/apply.c:3807 builtin/apply.c:3915
1811 +#: builtin/apply.c:3818 builtin/apply.c:3926
1812 #, c-format
1813 msgid "unable to add cache entry for %s"
1814 msgstr "kan inte lägga till cachepost för %s"
1815
1824 -#: builtin/apply.c:3840
1816 +#: builtin/apply.c:3851
1817 #, c-format
1818 msgid "closing file '%s'"
1819 msgstr "stänger filen \"%s\""
1820
1829 -#: builtin/apply.c:3889
1821 +#: builtin/apply.c:3900
1822 #, c-format
1823 msgid "unable to write file '%s' mode %o"
1824 msgstr "kan inte skriva filen \"%s\" läge %o"
1825
1834 -#: builtin/apply.c:3976
1826 +#: builtin/apply.c:3987
1827 #, c-format
1828 msgid "Applied patch %s cleanly."
1829 msgstr "Tillämpade patchen %s rent."
1830
1839 -#: builtin/apply.c:3984
1831 +#: builtin/apply.c:3995
1832 msgid "internal error"
1833 msgstr "internt fel"
1834
1835 #. Say this even without --verbose
1844 -#: builtin/apply.c:3987
1836 +#: builtin/apply.c:3998
1837 #, c-format
1838 msgid "Applying patch %%s with %d reject..."
1839 msgid_plural "Applying patch %%s with %d rejects..."
1840 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
1841 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
1842
1851 -#: builtin/apply.c:3997
1843 +#: builtin/apply.c:4008
1844 #, c-format
1845 msgid "truncating .rej filename to %.*s.rej"
1846 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
1847
1856 -#: builtin/apply.c:4018
1848 +#: builtin/apply.c:4029
1849 #, c-format
1850 msgid "Hunk #%d applied cleanly."
1851 msgstr "Stycke %d tillämpades rent."
1852
1861 -#: builtin/apply.c:4021
1853 +#: builtin/apply.c:4032
1854 #, c-format
1855 msgid "Rejected hunk #%d."
1856 msgstr "Refuserar stycke %d."
1857
1866 -#: builtin/apply.c:4171
1858 +#: builtin/apply.c:4182
1859 msgid "unrecognized input"
1860 msgstr "indata känns inte igen"
1861
1870 -#: builtin/apply.c:4182
1862 +#: builtin/apply.c:4193
1863 msgid "unable to read index file"
1864 msgstr "kan inte läsa indexfilen"
1865
1874 -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91
1866 +#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91
1867 #: builtin/fetch.c:63
1868 msgid "path"
1869 msgstr "sökväg"
1870
1879 -#: builtin/apply.c:4302
1871 +#: builtin/apply.c:4313
1872 msgid "don't apply changes matching the given path"
1873 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
1874
1883 -#: builtin/apply.c:4305
1875 +#: builtin/apply.c:4316
1876 msgid "apply changes matching the given path"
1877 msgstr "tillämpa ändringar som motsvarar given sökväg"
1878
1887 -#: builtin/apply.c:4307
1879 +#: builtin/apply.c:4318
1880 msgid "num"
1881 msgstr "antal"
1882
1891 -#: builtin/apply.c:4308
1883 +#: builtin/apply.c:4319
1884 msgid "remove <num> leading slashes from traditional diff paths"
1885 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
1886
1895 -#: builtin/apply.c:4311
1887 +#: builtin/apply.c:4322
1888 msgid "ignore additions made by the patch"
1889 msgstr "ignorera tillägg gjorda av patchen"
1890
1899 -#: builtin/apply.c:4313
1891 +#: builtin/apply.c:4324
1892 msgid "instead of applying the patch, output diffstat for the input"
1893 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
1894
1903 -#: builtin/apply.c:4317
1895 +#: builtin/apply.c:4328
1896 msgid "show number of added and deleted lines in decimal notation"
1897 msgstr "visa antal tillagda och borttagna rader decimalt"
1898
1907 -#: builtin/apply.c:4319
1899 +#: builtin/apply.c:4330
1900 msgid "instead of applying the patch, output a summary for the input"
1901 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
1902
1911 -#: builtin/apply.c:4321
1903 +#: builtin/apply.c:4332
1904 msgid "instead of applying the patch, see if the patch is applicable"
1905 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
1906
1915 -#: builtin/apply.c:4323
1907 +#: builtin/apply.c:4334
1908 msgid "make sure the patch is applicable to the current index"
1909 msgstr "se till att patchen kan tillämpas på aktuellt index"
1910
1919 -#: builtin/apply.c:4325
1911 +#: builtin/apply.c:4336
1912 msgid "apply a patch without touching the working tree"
1913 msgstr "tillämpa en patch utan att röra arbetskatalogen"
1914
1923 -#: builtin/apply.c:4327
1915 +#: builtin/apply.c:4338
1916 msgid "also apply the patch (use with --stat/--summary/--check)"
1917 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
1918
1927 -#: builtin/apply.c:4329
1919 +#: builtin/apply.c:4340
1920 msgid "attempt three-way merge if a patch does not apply"
1921 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
1922
1931 -#: builtin/apply.c:4331
1923 +#: builtin/apply.c:4342
1924 msgid "build a temporary index based on embedded index information"
1925 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
1926
1935 -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460
1927 +#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460
1928 msgid "paths are separated with NUL character"
1929 msgstr "sökvägar avdelas med NUL-tecken"
1930
1939 -#: builtin/apply.c:4336
1931 +#: builtin/apply.c:4347
1932 msgid "ensure at least <n> lines of context match"
1933 msgstr "se till att åtminstone <n> rader sammanhang är lika"
1934
1943 -#: builtin/apply.c:4337
1935 +#: builtin/apply.c:4348
1936 msgid "action"
1937 msgstr "åtgärd"
1938
1947 -#: builtin/apply.c:4338
1939 +#: builtin/apply.c:4349
1940 msgid "detect new or modified lines that have whitespace errors"
1941 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
1942
1951 -#: builtin/apply.c:4341 builtin/apply.c:4344
1943 +#: builtin/apply.c:4352 builtin/apply.c:4355
1944 msgid "ignore changes in whitespace when finding context"
1945 msgstr "ignorera ändringar i blanktecken för sammanhang"
1946
1955 -#: builtin/apply.c:4347
1947 +#: builtin/apply.c:4358
1948 msgid "apply the patch in reverse"
1949 msgstr "tillämpa patchen baklänges"
1950
1959 -#: builtin/apply.c:4349
1951 +#: builtin/apply.c:4360
1952 msgid "don't expect at least one line of context"
1953 msgstr "förvänta inte minst en rad sammanhang"
1954
1963 -#: builtin/apply.c:4351
1955 +#: builtin/apply.c:4362
1956 msgid "leave the rejected hunks in corresponding *.rej files"
1957 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
1958
1967 -#: builtin/apply.c:4353
1959 +#: builtin/apply.c:4364
1960 msgid "allow overlapping hunks"
1961 msgstr "tillåt överlappande stycken"
1962
1971 -#: builtin/apply.c:4356
1963 +#: builtin/apply.c:4367
1964 msgid "tolerate incorrectly detected missing new-line at the end of file"
1965 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
1966
1975 -#: builtin/apply.c:4359
1967 +#: builtin/apply.c:4370
1968 msgid "do not trust the line counts in the hunk headers"
1969 msgstr "lite inte på antalet linjer i styckehuvuden"
1970
1979 -#: builtin/apply.c:4361
1971 +#: builtin/apply.c:4372
1972 msgid "root"
1973 msgstr "rot"
1974
1983 -#: builtin/apply.c:4362
1975 +#: builtin/apply.c:4373
1976 msgid "prepend <root> to all filenames"
1977 msgstr "lägg till <rot> i alla filnamn"
1978
1987 -#: builtin/apply.c:4384
1979 +#: builtin/apply.c:4395
1980 msgid "--3way outside a repository"
1981 msgstr "--3way utanför arkiv"
1982
1991 -#: builtin/apply.c:4392
1983 +#: builtin/apply.c:4403
1984 msgid "--index outside a repository"
1985 msgstr "--index utanför arkiv"
1986
1995 -#: builtin/apply.c:4395
1987 +#: builtin/apply.c:4406
1988 msgid "--cached outside a repository"
1989 msgstr "--cached utanför arkiv"
1990
1999 -#: builtin/apply.c:4411
1991 +#: builtin/apply.c:4422
1992 #, c-format
1993 msgid "can't open patch '%s'"
1994 msgstr "kan inte öppna patchen \"%s\""
1995
2004 -#: builtin/apply.c:4425
1996 +#: builtin/apply.c:4436
1997 #, c-format
1998 msgid "squelched %d whitespace error"
1999 msgid_plural "squelched %d whitespace errors"
2000 msgstr[0] "undertryckte %d fel i blanksteg"
2001 msgstr[1] "undertryckte %d fel i blanksteg"
2002
2011 -#: builtin/apply.c:4431 builtin/apply.c:4441
2003 +#: builtin/apply.c:4442 builtin/apply.c:4452
2004 #, c-format
2005 msgid "%d line adds whitespace errors."
2006 msgid_plural "%d lines add whitespace errors."
@@ -2070,95 +2062,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"
2062 msgid "[rev-opts] are documented in git-rev-list(1)"
2063 msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"
2064
2073 -#: builtin/blame.c:2374
2065 +#: builtin/blame.c:2364
2066 msgid "Show blame entries as we find them, incrementally"
2067 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
2068
2077 -#: builtin/blame.c:2375
2069 +#: builtin/blame.c:2365
2070 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2071 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
2072
2081 -#: builtin/blame.c:2376
2073 +#: builtin/blame.c:2366
2074 msgid "Do not treat root commits as boundaries (Default: off)"
2075 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
2076
2085 -#: builtin/blame.c:2377
2077 +#: builtin/blame.c:2367
2078 msgid "Show work cost statistics"
2079 msgstr "Visa statistik över arbetskostnad"
2080
2089 -#: builtin/blame.c:2378
2081 +#: builtin/blame.c:2368
2082 msgid "Show output score for blame entries"
2083 msgstr "Visa utdatapoäng för klandringsposter"
2084
2093 -#: builtin/blame.c:2379
2085 +#: builtin/blame.c:2369
2086 msgid "Show original filename (Default: auto)"
2087 msgstr "Visa originalfilnamn (Standard: auto)"
2088
2097 -#: builtin/blame.c:2380
2089 +#: builtin/blame.c:2370
2090 msgid "Show original linenumber (Default: off)"
2091 msgstr "Visa ursprungligt radnummer (Standard: av)"
2092
2101 -#: builtin/blame.c:2381
2093 +#: builtin/blame.c:2371
2094 msgid "Show in a format designed for machine consumption"
2095 msgstr "Visa i ett format avsett för maskinkonsumtion"
2096
2105 -#: builtin/blame.c:2382
2097 +#: builtin/blame.c:2372
2098 msgid "Show porcelain format with per-line commit information"
2099 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
2100
2109 -#: builtin/blame.c:2383
2101 +#: builtin/blame.c:2373
2102 msgid "Use the same output mode as git-annotate (Default: off)"
2103 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
2104
2113 -#: builtin/blame.c:2384
2105 +#: builtin/blame.c:2374
2106 msgid "Show raw timestamp (Default: off)"
2107 msgstr "Visa rå tidsstämpel (Standard: av)"
2108
2117 -#: builtin/blame.c:2385
2109 +#: builtin/blame.c:2375
2110 msgid "Show long commit SHA1 (Default: off)"
2111 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
2112
2121 -#: builtin/blame.c:2386
2113 +#: builtin/blame.c:2376
2114 msgid "Suppress author name and timestamp (Default: off)"
2115 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
2116
2125 -#: builtin/blame.c:2387
2117 +#: builtin/blame.c:2377
2118 msgid "Show author email instead of name (Default: off)"
2119 msgstr "Visa författarens e-post istället för namn (Standard: av)"
2120
2129 -#: builtin/blame.c:2388
2121 +#: builtin/blame.c:2378
2122 msgid "Ignore whitespace differences"
2123 msgstr "Ignorera ändringar i blanksteg"
2124
2133 -#: builtin/blame.c:2389
2125 +#: builtin/blame.c:2379
2126 msgid "Spend extra cycles to find better match"
2127 msgstr "Slösa extra cykler med att hitta bättre träff"
2128
2137 -#: builtin/blame.c:2390
2129 +#: builtin/blame.c:2380
2130 msgid "Use revisions from <file> instead of calling git-rev-list"
2131 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
2132
2141 -#: builtin/blame.c:2391
2133 +#: builtin/blame.c:2381
2134 msgid "Use <file>'s contents as the final image"
2135 msgstr "Använd <fil>s innehåll som slutgiltig bild"
2136
2145 -#: builtin/blame.c:2392 builtin/blame.c:2393
2137 +#: builtin/blame.c:2382 builtin/blame.c:2383
2138 msgid "score"
2139 msgstr "poäng"
2140
2149 -#: builtin/blame.c:2392
2141 +#: builtin/blame.c:2382
2142 msgid "Find line copies within and across files"
2143 msgstr "Hitta kopierade rader inuti och mellan filer"
2144
2153 -#: builtin/blame.c:2393
2145 +#: builtin/blame.c:2383
2146 msgid "Find line movements within and across files"
2147 msgstr "Hitta flyttade rader inuti och mellan filer"
2148
2157 -#: builtin/blame.c:2394
2149 +#: builtin/blame.c:2384
2150 msgid "n,m"
2151 msgstr "n,m"
2152
2161 -#: builtin/blame.c:2394
2153 +#: builtin/blame.c:2384
2154 msgid "Process only line range n,m, counting from 1"
2155 msgstr "Behandla endast radintervallet n,m, med början på 1"
2156
@@ -2367,8 +2359,8 @@ msgid "act on remote-tracking branches"
2359 msgstr "arbeta på fjärrspårande grenar"
2360
2361 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2370 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377
2371 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470
2362 +#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379
2363 +#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470
2364 msgid "commit"
2365 msgstr "incheckning"
2366
@@ -2853,7 +2845,7 @@ msgstr "utför en 3-vägssammanslagning för den nya grenen"
2845 msgid "update ignored files (default)"
2846 msgstr "uppdatera ignorerade filer (standard)"
2847
2856 -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241
2848 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2849 msgid "style"
2850 msgstr "stil"
2851
@@ -2903,52 +2895,77 @@ msgstr ""
2895 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
2896 "du checkar ut från indexet."
2897
2906 -#: builtin/clean.c:19
2898 +#: builtin/clean.c:20
2899 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
2900 msgstr ""
2901 "git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..."
2902
2911 -#: builtin/clean.c:51
2903 +#: builtin/clean.c:24
2904 +#, c-format
2905 +msgid "Removing %s\n"
2906 +msgstr "Tar bort %s\n"
2907 +
2908 +#: builtin/clean.c:25
2909 +#, c-format
2910 +msgid "Would remove %s\n"
2911 +msgstr "Skulle ta bort %s\n"
2912 +
2913 +#: builtin/clean.c:26
2914 +#, c-format
2915 +msgid "Skipping repository %s\n"
2916 +msgstr "Hoppar över arkivet %s\n"
2917 +
2918 +#: builtin/clean.c:27
2919 +#, c-format
2920 +msgid "Would skip repository %s\n"
2921 +msgstr "Skulle hoppa över arkivet %s\n"
2922 +
2923 +#: builtin/clean.c:28
2924 +#, c-format
2925 +msgid "failed to remove %s"
2926 +msgstr "misslyckades ta bort %s"
2927 +
2928 +#: builtin/clean.c:159
2929 msgid "do not print names of files removed"
2930 msgstr "skriv inte ut namn på borttagna filer"
2931
2915 -#: builtin/clean.c:53
2932 +#: builtin/clean.c:161
2933 msgid "force"
2934 msgstr "tvinga"
2935
2919 -#: builtin/clean.c:55
2936 +#: builtin/clean.c:163
2937 msgid "remove whole directories"
2938 msgstr "ta bort hela kataloger"
2939
2923 -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717
2940 +#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717
2941 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2942 msgid "pattern"
2943 msgstr "mönster"
2944
2928 -#: builtin/clean.c:57
2945 +#: builtin/clean.c:165
2946 msgid "add <pattern> to ignore rules"
2947 msgstr "lägg till <mönster> till ignoreringsregler"
2948
2932 -#: builtin/clean.c:58
2949 +#: builtin/clean.c:166
2950 msgid "remove ignored files, too"
2951 msgstr "ta även bort ignorerade filer"
2952
2936 -#: builtin/clean.c:60
2953 +#: builtin/clean.c:168
2954 msgid "remove only ignored files"
2955 msgstr "ta endast bort ignorerade filer"
2956
2940 -#: builtin/clean.c:78
2957 +#: builtin/clean.c:186
2958 msgid "-x and -X cannot be used together"
2959 msgstr "-x och -X kan inte användas samtidigt"
2960
2944 -#: builtin/clean.c:82
2961 +#: builtin/clean.c:190
2962 msgid ""
2963 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
2964 msgstr ""
2965 "clean.requireForce satt till true, men varken -n eller -f angavs; vägrar "
2966 "städa"
2967
2951 -#: builtin/clean.c:85
2968 +#: builtin/clean.c:193
2969 msgid ""
2970 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
2971 "clean"
@@ -2956,37 +2973,12 @@ msgstr ""
2973 "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; "
2974 "vägrar städa"
2975
2959 -#: builtin/clean.c:155 builtin/clean.c:176
2960 -#, c-format
2961 -msgid "Would remove %s\n"
2962 -msgstr "Skulle ta bort %s\n"
2963 -
2964 -#: builtin/clean.c:159 builtin/clean.c:179
2965 -#, c-format
2966 -msgid "Removing %s\n"
2967 -msgstr "Tar bort %s\n"
2968 -
2969 -#: builtin/clean.c:162 builtin/clean.c:182
2970 -#, c-format
2971 -msgid "failed to remove %s"
2972 -msgstr "misslyckades ta bort %s"
2973 -
2974 -#: builtin/clean.c:166
2975 -#, c-format
2976 -msgid "Would not remove %s\n"
2977 -msgstr "Skulle inte ta bort %s\n"
2978 -
2979 -#: builtin/clean.c:168
2980 -#, c-format
2981 -msgid "Not removing %s\n"
2982 -msgstr "Tar inte bort %s\n"
2983 -
2976 #: builtin/clone.c:36
2977 msgid "git clone [options] [--] <repo> [<dir>]"
2978 msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"
2979
2980 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
2989 -#: builtin/push.c:399
2981 +#: builtin/push.c:407
2982 msgid "force progress reporting"
2983 msgstr "tvinga förloppsrapportering"
2984
@@ -3099,6 +3091,11 @@ msgstr "%s finns och är ingen katalog"
3091 msgid "failed to stat %s\n"
3092 msgstr "misslyckades ta status på %s\n"
3093
3094 +#: builtin/clone.c:341
3095 +#, c-format
3096 +msgid "failed to unlink '%s'"
3097 +msgstr "misslyckades ta bort länken \"%s\""
3098 +
3099 #: builtin/clone.c:346
3100 #, c-format
3101 msgid "failed to create link '%s'"
@@ -3137,56 +3134,60 @@ msgstr "Du måste ange ett arkiv att klona."
3134 msgid "--bare and --origin %s options are incompatible."
3135 msgstr "flaggorna --bare och --origin %s är inkompatibla."
3136
3140 -#: builtin/clone.c:719
3137 +#: builtin/clone.c:708
3138 +msgid "--bare and --separate-git-dir are incompatible."
3139 +msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
3140 +
3141 +#: builtin/clone.c:721
3142 #, c-format
3143 msgid "repository '%s' does not exist"
3144 msgstr "arkivet \"%s\" finns inte"
3145
3145 -#: builtin/clone.c:724
3146 +#: builtin/clone.c:726
3147 msgid "--depth is ignored in local clones; use file:// instead."
3148 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
3149
3149 -#: builtin/clone.c:734
3150 +#: builtin/clone.c:736
3151 #, c-format
3152 msgid "destination path '%s' already exists and is not an empty directory."
3153 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
3154
3154 -#: builtin/clone.c:744
3155 +#: builtin/clone.c:746
3156 #, c-format
3157 msgid "working tree '%s' already exists."
3158 msgstr "arbetsträdet \"%s\" finns redan."
3159
3159 -#: builtin/clone.c:757 builtin/clone.c:771
3160 +#: builtin/clone.c:759 builtin/clone.c:773
3161 #, c-format
3162 msgid "could not create leading directories of '%s'"
3163 msgstr "kunde inte skapa inledande kataloger för \"%s\""
3164
3164 -#: builtin/clone.c:760
3165 +#: builtin/clone.c:762
3166 #, c-format
3167 msgid "could not create work tree dir '%s'."
3168 msgstr "kunde inte skapa arbetskatalogen \"%s\""
3169
3169 -#: builtin/clone.c:779
3170 +#: builtin/clone.c:783
3171 #, c-format
3172 msgid "Cloning into bare repository '%s'...\n"
3173 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
3174
3174 -#: builtin/clone.c:781
3175 +#: builtin/clone.c:785
3176 #, c-format
3177 msgid "Cloning into '%s'...\n"
3178 msgstr "Klonar till \"%s\"...\n"
3179
3179 -#: builtin/clone.c:823
3180 +#: builtin/clone.c:827
3181 #, c-format
3182 msgid "Don't know how to clone %s"
3183 msgstr "Vet inte hur man klonar %s"
3184
3184 -#: builtin/clone.c:872
3185 +#: builtin/clone.c:876
3186 #, c-format
3187 msgid "Remote branch %s not found in upstream %s"
3188 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
3189
3189 -#: builtin/clone.c:879
3190 +#: builtin/clone.c:883
3191 msgid "You appear to have cloned an empty repository."
3192 msgstr "Du verkar ha klonat ett tomt arkiv."
3193
@@ -3332,7 +3333,7 @@ msgstr "Felaktig indragningssträng: \"%s\""
3333 msgid "could not lookup commit %s"
3334 msgstr "kunde inte slå upp incheckningen %s"
3335
3335 -#: builtin/commit.c:610 builtin/shortlog.c:296
3336 +#: builtin/commit.c:610 builtin/shortlog.c:272
3337 #, c-format
3338 msgid "(reading log message from standard input)\n"
3339 msgstr "(läser loggmeddelande från standard in)\n"
@@ -3510,32 +3511,32 @@ msgstr "Kan inte ange sökvägar med -a."
3511 msgid "--long and -z are incompatible"
3512 msgstr "--long och -z är inkompatibla"
3513
3513 -#: builtin/commit.c:1162 builtin/commit.c:1398
3514 +#: builtin/commit.c:1162 builtin/commit.c:1400
3515 msgid "show status concisely"
3516 msgstr "vis koncis status"
3517
3517 -#: builtin/commit.c:1164 builtin/commit.c:1400
3518 +#: builtin/commit.c:1164 builtin/commit.c:1402
3519 msgid "show branch information"
3520 msgstr "visa information om gren"
3521
3521 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389
3522 +#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397
3523 msgid "machine-readable output"
3524 msgstr "maskinläsbar utdata"
3525
3525 -#: builtin/commit.c:1169 builtin/commit.c:1404
3526 +#: builtin/commit.c:1169 builtin/commit.c:1406
3527 msgid "show status in long format (default)"
3528 msgstr "visa status i långt format (standard)"
3529
3529 -#: builtin/commit.c:1172 builtin/commit.c:1407
3530 +#: builtin/commit.c:1172 builtin/commit.c:1409
3531 msgid "terminate entries with NUL"
3532 msgstr "terminera poster med NUL"
3533
3533 -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636
3534 -#: builtin/fast-export.c:639 builtin/tag.c:461
3534 +#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647
3535 +#: builtin/fast-export.c:650 builtin/tag.c:461
3536 msgid "mode"
3537 msgstr "läge"
3538
3538 -#: builtin/commit.c:1175 builtin/commit.c:1410
3539 +#: builtin/commit.c:1175 builtin/commit.c:1412
3540 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3541 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
3542
@@ -3575,197 +3576,197 @@ msgstr "frånkopplad HEAD"
3576 msgid " (root-commit)"
3577 msgstr " (rotincheckning)"
3578
3578 -#: builtin/commit.c:1368
3579 +#: builtin/commit.c:1370
3580 msgid "suppress summary after successful commit"
3581 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
3582
3582 -#: builtin/commit.c:1369
3583 +#: builtin/commit.c:1371
3584 msgid "show diff in commit message template"
3585 msgstr "visa diff i mallen för incheckningsmeddelandet"
3586
3586 -#: builtin/commit.c:1371
3587 +#: builtin/commit.c:1373
3588 msgid "Commit message options"
3589 msgstr "Alternativ för incheckningsmeddelande"
3590
3590 -#: builtin/commit.c:1372 builtin/tag.c:459
3591 +#: builtin/commit.c:1374 builtin/tag.c:459
3592 msgid "read message from file"
3593 msgstr "läs meddelande från fil"
3594
3594 -#: builtin/commit.c:1373
3595 +#: builtin/commit.c:1375
3596 msgid "author"
3597 msgstr "författare"
3598
3598 -#: builtin/commit.c:1373
3599 +#: builtin/commit.c:1375
3600 msgid "override author for commit"
3601 msgstr "överstyr författare för incheckningen"
3602
3602 -#: builtin/commit.c:1374 builtin/gc.c:178
3603 +#: builtin/commit.c:1376 builtin/gc.c:178
3604 msgid "date"
3605 msgstr "datum"
3606
3606 -#: builtin/commit.c:1374
3607 +#: builtin/commit.c:1376
3608 msgid "override date for commit"
3609 msgstr "överstyr datum för inchecknignen"
3610
3610 -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537
3611 +#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537
3612 #: builtin/notes.c:694 builtin/tag.c:457
3613 msgid "message"
3614 msgstr "meddelande"
3615
3615 -#: builtin/commit.c:1375
3616 +#: builtin/commit.c:1377
3617 msgid "commit message"
3618 msgstr "incheckningsmeddelande"
3619
3619 -#: builtin/commit.c:1376
3620 +#: builtin/commit.c:1378
3621 msgid "reuse and edit message from specified commit"
3622 msgstr "återanvänd och redigera meddelande från angiven incheckning"
3623
3623 -#: builtin/commit.c:1377
3624 +#: builtin/commit.c:1379
3625 msgid "reuse message from specified commit"
3626 msgstr "återanvänd meddelande från angiven incheckning"
3627
3627 -#: builtin/commit.c:1378
3628 +#: builtin/commit.c:1380
3629 msgid "use autosquash formatted message to fixup specified commit"
3630 msgstr ""
3631 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"
3632
3632 -#: builtin/commit.c:1379
3633 +#: builtin/commit.c:1381
3634 msgid "use autosquash formatted message to squash specified commit"
3635 msgstr ""
3636 "använd autosquash-formaterat meddelande för att slå ihop med angiven "
3637 "incheckning"
3638
3638 -#: builtin/commit.c:1380
3639 +#: builtin/commit.c:1382
3640 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3641 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
3642
3642 -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109
3643 +#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109
3644 msgid "add Signed-off-by:"
3645 msgstr "lägg till Signed-off-by:"
3646
3646 -#: builtin/commit.c:1382
3647 +#: builtin/commit.c:1384
3648 msgid "use specified template file"
3649 msgstr "använd angiven mallfil"
3650
3650 -#: builtin/commit.c:1383
3651 +#: builtin/commit.c:1385
3652 msgid "force edit of commit"
3653 msgstr "tvinga redigering av incheckning"
3654
3654 -#: builtin/commit.c:1384
3655 +#: builtin/commit.c:1386
3656 msgid "default"
3657 msgstr "standard"
3658
3658 -#: builtin/commit.c:1384 builtin/tag.c:462
3659 +#: builtin/commit.c:1386 builtin/tag.c:462
3660 msgid "how to strip spaces and #comments from message"
3661 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
3662
3662 -#: builtin/commit.c:1385
3663 +#: builtin/commit.c:1387
3664 msgid "include status in commit message template"
3665 msgstr "inkludera status i mallen för incheckningsmeddelandet"
3666
3666 -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463
3667 +#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463
3668 msgid "key id"
3669 msgstr "nyckel-id"
3670
3670 -#: builtin/commit.c:1387 builtin/merge.c:214
3671 +#: builtin/commit.c:1389 builtin/merge.c:214
3672 msgid "GPG sign commit"
3673 msgstr "GPG-signera incheckning"
3674
3675 #. end commit message options
3675 -#: builtin/commit.c:1390
3676 +#: builtin/commit.c:1392
3677 msgid "Commit contents options"
3678 msgstr "Alternativ för incheckningens innehåll"
3679
3679 -#: builtin/commit.c:1391
3680 +#: builtin/commit.c:1393
3681 msgid "commit all changed files"
3682 msgstr "checka in alla ändrade filer"
3683
3683 -#: builtin/commit.c:1392
3684 +#: builtin/commit.c:1394
3685 msgid "add specified files to index for commit"
3686 msgstr "lägg till angivna filer till indexet för incheckning"
3687
3687 -#: builtin/commit.c:1393
3688 +#: builtin/commit.c:1395
3689 msgid "interactively add files"
3690 msgstr "lägg till filer interaktivt"
3691
3691 -#: builtin/commit.c:1394
3692 +#: builtin/commit.c:1396
3693 msgid "interactively add changes"
3694 msgstr "lägg till ändringar interaktivt"
3695
3695 -#: builtin/commit.c:1395
3696 +#: builtin/commit.c:1397
3697 msgid "commit only specified files"
3698 msgstr "checka endast in angivna filer"
3699
3699 -#: builtin/commit.c:1396
3700 +#: builtin/commit.c:1398
3701 msgid "bypass pre-commit hook"
3702 msgstr "förbigå pre-commit-krok"
3703
3703 -#: builtin/commit.c:1397
3704 +#: builtin/commit.c:1399
3705 msgid "show what would be committed"
3706 msgstr "visa vad som skulle checkas in"
3707
3707 -#: builtin/commit.c:1408
3708 +#: builtin/commit.c:1410
3709 msgid "amend previous commit"
3710 msgstr "lägg till föregående incheckning"
3711
3711 -#: builtin/commit.c:1409
3712 +#: builtin/commit.c:1411
3713 msgid "bypass post-rewrite hook"
3714 msgstr "förbigå post-rewrite-krok"
3715
3715 -#: builtin/commit.c:1414
3716 +#: builtin/commit.c:1416
3717 msgid "ok to record an empty change"
3718 msgstr "ok att registrera en tom ändring"
3719
3719 -#: builtin/commit.c:1417
3720 +#: builtin/commit.c:1419
3721 msgid "ok to record a change with an empty message"
3722 msgstr "ok att registrera en ändring med tomt meddelande"
3723
3723 -#: builtin/commit.c:1449
3724 +#: builtin/commit.c:1451
3725 msgid "could not parse HEAD commit"
3726 msgstr "kunde inte tolka HEAD:s incheckning"
3727
3727 -#: builtin/commit.c:1487 builtin/merge.c:508
3728 +#: builtin/commit.c:1489 builtin/merge.c:508
3729 #, c-format
3730 msgid "could not open '%s' for reading"
3731 msgstr "kunde inte öppna \"%s\" för läsning"
3732
3732 -#: builtin/commit.c:1494
3733 +#: builtin/commit.c:1496
3734 #, c-format
3735 msgid "Corrupt MERGE_HEAD file (%s)"
3736 msgstr "Trasig MERGE_HEAD-fil (%s)"
3737
3737 -#: builtin/commit.c:1501
3738 +#: builtin/commit.c:1503
3739 msgid "could not read MERGE_MODE"
3740 msgstr "kunde inte läsa MERGE_MODE"
3741
3741 -#: builtin/commit.c:1520
3742 +#: builtin/commit.c:1522
3743 #, c-format
3744 msgid "could not read commit message: %s"
3745 msgstr "kunde inte läsa incheckningsmeddelande: %s"
3746
3746 -#: builtin/commit.c:1534
3747 +#: builtin/commit.c:1536
3748 #, c-format
3749 msgid "Aborting commit; you did not edit the message.\n"
3750 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
3751
3751 -#: builtin/commit.c:1539
3752 +#: builtin/commit.c:1541
3753 #, c-format
3754 msgid "Aborting commit due to empty commit message.\n"
3755 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
3756
3756 -#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857
3757 +#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858
3758 msgid "failed to write commit object"
3759 msgstr "kunde inte skriva incheckningsobjekt"
3760
3760 -#: builtin/commit.c:1575
3761 +#: builtin/commit.c:1577
3762 msgid "cannot lock HEAD ref"
3763 msgstr "kunde inte låsa HEAD-referens"
3764
3764 -#: builtin/commit.c:1579
3765 +#: builtin/commit.c:1581
3766 msgid "cannot update HEAD ref"
3767 msgstr "kunde inte uppdatera HEAD-referens"
3768
3768 -#: builtin/commit.c:1590
3769 +#: builtin/commit.c:1592
3770 msgid ""
3771 "Repository has been updated, but unable to write\n"
3772 "new_index file. Check that disk is not full or quota is\n"
@@ -4070,39 +4071,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."
4071 msgid "git fast-export [rev-list-opts]"
4072 msgstr "git fast-export [rev-list-flaggor]"
4073
4073 -#: builtin/fast-export.c:635
4074 +#: builtin/fast-export.c:646
4075 msgid "show progress after <n> objects"
4076 msgstr "visa förlopp efter <n> objekt"
4077
4077 -#: builtin/fast-export.c:637
4078 +#: builtin/fast-export.c:648
4079 msgid "select handling of signed tags"
4080 msgstr "välj hantering av signerade taggar"
4081
4081 -#: builtin/fast-export.c:640
4082 +#: builtin/fast-export.c:651
4083 msgid "select handling of tags that tag filtered objects"
4084 msgstr "välj hantering av taggar som har taggfiltrerade objekt"
4085
4085 -#: builtin/fast-export.c:643
4086 +#: builtin/fast-export.c:654
4087 msgid "Dump marks to this file"
4088 msgstr "Dump märken till filen"
4089
4089 -#: builtin/fast-export.c:645
4090 +#: builtin/fast-export.c:656
4091 msgid "Import marks from this file"
4092 msgstr "Importera märken från filen"
4093
4093 -#: builtin/fast-export.c:647
4094 +#: builtin/fast-export.c:658
4095 msgid "Fake a tagger when tags lack one"
4096 msgstr "Fejka taggare när taggen saknar en"
4097
4097 -#: builtin/fast-export.c:649
4098 +#: builtin/fast-export.c:660
4099 msgid "Output full tree for each commit"
4100 msgstr "Skriv ut hela trädet för varje incheckning"
4101
4101 -#: builtin/fast-export.c:651
4102 +#: builtin/fast-export.c:662
4103 msgid "Use the done feature to terminate the stream"
4104 msgstr "Använd done-funktionen för att avsluta strömmen"
4105
4105 -#: builtin/fast-export.c:652
4106 +#: builtin/fast-export.c:663
4107 msgid "Skip output of blob data"
4108 msgstr "Hoppa över skrivning av blob-data"
4109
@@ -4174,7 +4175,7 @@ msgstr "tillåt uppdatering av HEAD-referens"
4175 msgid "deepen history of shallow clone"
4176 msgstr "fördjupa historik för grund klon"
4177
4177 -#: builtin/fetch.c:85 builtin/log.c:1088
4178 +#: builtin/fetch.c:85 builtin/log.c:1119
4179 msgid "dir"
4180 msgstr "kat"
4181
@@ -4346,29 +4347,29 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4347 msgstr ""
4348 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"
4349
4349 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701
4350 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4351 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4351 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4352 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239
4353 msgid "n"
4354 msgstr "n"
4355
4355 -#: builtin/fmt-merge-msg.c:654
4356 +#: builtin/fmt-merge-msg.c:660
4357 msgid "populate log with at most <n> entries from shortlog"
4358 msgstr "fyll i loggen med som mest <n> poster från shortlog"
4359
4359 -#: builtin/fmt-merge-msg.c:657
4360 +#: builtin/fmt-merge-msg.c:663
4361 msgid "alias for --log (deprecated)"
4362 msgstr "alias för --log (avråds)"
4363
4363 -#: builtin/fmt-merge-msg.c:660
4364 +#: builtin/fmt-merge-msg.c:666
4365 msgid "text"
4366 msgstr "text"
4367
4367 -#: builtin/fmt-merge-msg.c:661
4368 +#: builtin/fmt-merge-msg.c:667
4369 msgid "use <text> as start of message"
4370 msgstr "inled meddelande med <text>"
4371
4371 -#: builtin/fmt-merge-msg.c:662
4372 +#: builtin/fmt-merge-msg.c:668
4373 msgid "file to read from"
4374 msgstr "fil att läsa från"
4375
@@ -5294,244 +5295,252 @@ msgstr "Kan inte komma åt aktuell arbetskatalog"
5295 msgid "Cannot access work tree '%s'"
5296 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
5297
5297 -#: builtin/log.c:37
5298 +#: builtin/log.c:39
5299 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5300 msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n"
5301
5301 -#: builtin/log.c:38
5302 +#: builtin/log.c:40
5303 msgid " or: git show [options] <object>..."
5304 msgstr " eller: git show [flaggor] <objekt>..."
5305
5305 -#: builtin/log.c:100
5306 +#: builtin/log.c:102
5307 msgid "suppress diff output"
5308 msgstr "undertryck diff-utdata"
5309
5309 -#: builtin/log.c:101
5310 +#: builtin/log.c:103
5311 msgid "show source"
5312 msgstr "visa källkod"
5313
5313 -#: builtin/log.c:102
5314 +#: builtin/log.c:104
5315 +msgid "Use mail map file"
5316 +msgstr "Använd e-postmappningsfil"
5317 +
5318 +#: builtin/log.c:105
5319 msgid "decorate options"
5320 msgstr "dekoreringsflaggor"
5321
5317 -#: builtin/log.c:189
5322 +#: builtin/log.c:198
5323 #, c-format
5324 msgid "Final output: %d %s\n"
5325 msgstr "Slututdata: %d %s\n"
5326
5322 -#: builtin/log.c:405 builtin/log.c:497
5327 +#: builtin/log.c:419 builtin/log.c:511
5328 #, c-format
5329 msgid "Could not read object %s"
5330 msgstr "Kunde inte läsa objektet %s"
5331
5327 -#: builtin/log.c:521
5332 +#: builtin/log.c:535
5333 #, c-format
5334 msgid "Unknown type: %d"
5335 msgstr "Okänd typ: %d"
5336
5332 -#: builtin/log.c:613
5337 +#: builtin/log.c:627
5338 msgid "format.headers without value"
5339 msgstr "format.headers utan värde"
5340
5336 -#: builtin/log.c:687
5341 +#: builtin/log.c:701
5342 msgid "name of output directory is too long"
5343 msgstr "namnet på utdatakatalogen är för långt"
5344
5340 -#: builtin/log.c:698
5345 +#: builtin/log.c:717
5346 #, c-format
5347 msgid "Cannot open patch file %s"
5348 msgstr "Kan inte öppna patchfilen %s"
5349
5345 -#: builtin/log.c:712
5350 +#: builtin/log.c:731
5351 msgid "Need exactly one range."
5352 msgstr "Behöver precis ett intervall."
5353
5349 -#: builtin/log.c:720
5354 +#: builtin/log.c:739
5355 msgid "Not a range."
5356 msgstr "Inte ett intervall."
5357
5353 -#: builtin/log.c:794
5358 +#: builtin/log.c:812
5359 msgid "Cover letter needs email format"
5360 msgstr "Omslagsbrevet behöver e-postformat"
5361
5357 -#: builtin/log.c:867
5362 +#: builtin/log.c:885
5363 #, c-format
5364 msgid "insane in-reply-to: %s"
5365 msgstr "tokigt in-reply-to: %s"
5366
5362 -#: builtin/log.c:895
5367 +#: builtin/log.c:913
5368 msgid "git format-patch [options] [<since> | <revision range>]"
5369 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"
5370
5366 -#: builtin/log.c:940
5371 +#: builtin/log.c:958
5372 msgid "Two output directories?"
5373 msgstr "Två utdatakataloger?"
5374
5370 -#: builtin/log.c:1068
5375 +#: builtin/log.c:1097
5376 msgid "use [PATCH n/m] even with a single patch"
5377 msgstr "använd [PATCH n/m] även för en ensam patch"
5378
5374 -#: builtin/log.c:1071
5379 +#: builtin/log.c:1100
5380 msgid "use [PATCH] even with multiple patches"
5381 msgstr "använd [PATCH] även för flera patchar"
5382
5378 -#: builtin/log.c:1075
5383 +#: builtin/log.c:1104
5384 msgid "print patches to standard out"
5385 msgstr "skriv patcharna på stnadard ut"
5386
5382 -#: builtin/log.c:1077
5387 +#: builtin/log.c:1106
5388 msgid "generate a cover letter"
5389 msgstr "generera ett följebrev"
5390
5386 -#: builtin/log.c:1079
5391 +#: builtin/log.c:1108
5392 msgid "use simple number sequence for output file names"
5393 msgstr "använd enkel nummersekvens för utdatafilnamn"
5394
5390 -#: builtin/log.c:1080
5395 +#: builtin/log.c:1109
5396 msgid "sfx"
5397 msgstr "sfx"
5398
5394 -#: builtin/log.c:1081
5399 +#: builtin/log.c:1110
5400 msgid "use <sfx> instead of '.patch'"
5401 msgstr "använd <sfx> istället för \".patch\""
5402
5398 -#: builtin/log.c:1083
5403 +#: builtin/log.c:1112
5404 msgid "start numbering patches at <n> instead of 1"
5405 msgstr "börja numrera patchar på <n> istället för 1"
5406
5402 -#: builtin/log.c:1085
5407 +#: builtin/log.c:1114
5408 +msgid "mark the series as Nth re-roll"
5409 +msgstr "markera serien som N:te försök"
5410 +
5411 +#: builtin/log.c:1116
5412 msgid "Use [<prefix>] instead of [PATCH]"
5413 msgstr "Använd [<prefix>] istället för [PATCH]"
5414
5406 -#: builtin/log.c:1088
5415 +#: builtin/log.c:1119
5416 msgid "store resulting files in <dir>"
5417 msgstr "spara filerna i <katalog>"
5418
5410 -#: builtin/log.c:1091
5419 +#: builtin/log.c:1122
5420 msgid "don't strip/add [PATCH]"
5421 msgstr "ta inte bort eller lägg till [PATCH]"
5422
5414 -#: builtin/log.c:1094
5423 +#: builtin/log.c:1125
5424 msgid "don't output binary diffs"
5425 msgstr "skriv inte binära diffar"
5426
5418 -#: builtin/log.c:1096
5427 +#: builtin/log.c:1127
5428 msgid "don't include a patch matching a commit upstream"
5429 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
5430
5422 -#: builtin/log.c:1098
5431 +#: builtin/log.c:1129
5432 msgid "show patch format instead of default (patch + stat)"
5433 msgstr "visa patchformat istället för standard (patch + stat)"
5434
5426 -#: builtin/log.c:1100
5435 +#: builtin/log.c:1131
5436 msgid "Messaging"
5437 msgstr "E-post"
5438
5430 -#: builtin/log.c:1101
5439 +#: builtin/log.c:1132
5440 msgid "header"
5441 msgstr "huvud"
5442
5434 -#: builtin/log.c:1102
5443 +#: builtin/log.c:1133
5444 msgid "add email header"
5445 msgstr "lägg till e-posthuvud"
5446
5438 -#: builtin/log.c:1103 builtin/log.c:1105
5447 +#: builtin/log.c:1134 builtin/log.c:1136
5448 msgid "email"
5449 msgstr "epost"
5450
5442 -#: builtin/log.c:1103
5451 +#: builtin/log.c:1134
5452 msgid "add To: header"
5453 msgstr "Lägg till mottagarhuvud (\"To:\")"
5454
5446 -#: builtin/log.c:1105
5455 +#: builtin/log.c:1136
5456 msgid "add Cc: header"
5457 msgstr "Lägg till kopiehuvud (\"Cc:\")"
5458
5450 -#: builtin/log.c:1107
5459 +#: builtin/log.c:1138
5460 msgid "message-id"
5461 msgstr "meddelande-id"
5462
5454 -#: builtin/log.c:1108
5463 +#: builtin/log.c:1139
5464 msgid "make first mail a reply to <message-id>"
5465 msgstr "Gör det första brevet ett svar till <meddelande-id>"
5466
5458 -#: builtin/log.c:1109 builtin/log.c:1112
5467 +#: builtin/log.c:1140 builtin/log.c:1143
5468 msgid "boundary"
5469 msgstr "gräns"
5470
5462 -#: builtin/log.c:1110
5471 +#: builtin/log.c:1141
5472 msgid "attach the patch"
5473 msgstr "bifoga patchen"
5474
5466 -#: builtin/log.c:1113
5475 +#: builtin/log.c:1144
5476 msgid "inline the patch"
5477 msgstr "gör patchen ett inline-objekt"
5478
5470 -#: builtin/log.c:1117
5479 +#: builtin/log.c:1148
5480 msgid "enable message threading, styles: shallow, deep"
5481 msgstr "aktivera brevtrådning, typer: shallow, deep"
5482
5474 -#: builtin/log.c:1119
5483 +#: builtin/log.c:1150
5484 msgid "signature"
5485 msgstr "signatur"
5486
5478 -#: builtin/log.c:1120
5487 +#: builtin/log.c:1151
5488 msgid "add a signature"
5489 msgstr "lägg till signatur"
5490
5482 -#: builtin/log.c:1122
5491 +#: builtin/log.c:1153
5492 msgid "don't print the patch filenames"
5493 msgstr "visa inte filnamn för patchar"
5494
5486 -#: builtin/log.c:1163
5495 +#: builtin/log.c:1202
5496 #, c-format
5497 msgid "bogus committer info %s"
5498 msgstr "felaktig incheckarinformation %s"
5499
5491 -#: builtin/log.c:1208
5500 +#: builtin/log.c:1247
5501 msgid "-n and -k are mutually exclusive."
5502 msgstr "-n och -k kan inte användas samtidigt."
5503
5495 -#: builtin/log.c:1210
5504 +#: builtin/log.c:1249
5505 msgid "--subject-prefix and -k are mutually exclusive."
5506 msgstr "--subject-prefix och -k kan inte användas samtidigt."
5507
5499 -#: builtin/log.c:1218
5508 +#: builtin/log.c:1257
5509 msgid "--name-only does not make sense"
5510 msgstr "kan inte använda --name-only"
5511
5503 -#: builtin/log.c:1220
5512 +#: builtin/log.c:1259
5513 msgid "--name-status does not make sense"
5514 msgstr "kan inte använda --name-status"
5515
5507 -#: builtin/log.c:1222
5516 +#: builtin/log.c:1261
5517 msgid "--check does not make sense"
5518 msgstr "kan inte använda --check"
5519
5511 -#: builtin/log.c:1245
5520 +#: builtin/log.c:1284
5521 msgid "standard output, or directory, which one?"
5522 msgstr "standard ut, eller katalog, vilken skall det vara?"
5523
5515 -#: builtin/log.c:1247
5524 +#: builtin/log.c:1286
5525 #, c-format
5526 msgid "Could not create directory '%s'"
5527 msgstr "Kunde inte skapa katalogen \"%s\""
5528
5520 -#: builtin/log.c:1400
5529 +#: builtin/log.c:1439
5530 msgid "Failed to create output files"
5531 msgstr "Misslyckades skapa utdatafiler"
5532
5524 -#: builtin/log.c:1449
5533 +#: builtin/log.c:1488
5534 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5535 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
5536
5528 -#: builtin/log.c:1504
5537 +#: builtin/log.c:1543
5538 #, c-format
5539 msgid ""
5540 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5541 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
5542
5534 -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
5543 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5544 #, c-format
5545 msgid "Unknown commit %s"
5546 msgstr "Okänd incheckning %s"
@@ -5850,53 +5859,53 @@ msgstr ""
5859 "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"
5860 "avbryter incheckningen.\n"
5861
5853 -#: builtin/merge.c:812
5862 +#: builtin/merge.c:813
5863 msgid "Empty commit message."
5864 msgstr "Tomt incheckningsmeddelande."
5865
5857 -#: builtin/merge.c:824
5866 +#: builtin/merge.c:825
5867 #, c-format
5868 msgid "Wonderful.\n"
5869 msgstr "Underbart.\n"
5870
5862 -#: builtin/merge.c:889
5871 +#: builtin/merge.c:890
5872 #, c-format
5873 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5874 msgstr ""
5875 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
5876
5868 -#: builtin/merge.c:905
5877 +#: builtin/merge.c:906
5878 #, c-format
5879 msgid "'%s' is not a commit"
5880 msgstr "\"%s\" är inte en incheckning"
5881
5873 -#: builtin/merge.c:946
5882 +#: builtin/merge.c:947
5883 msgid "No current branch."
5884 msgstr "Inte på någon gren."
5885
5877 -#: builtin/merge.c:948
5886 +#: builtin/merge.c:949
5887 msgid "No remote for the current branch."
5888 msgstr "Ingen fjärr för aktuell gren."
5889
5881 -#: builtin/merge.c:950
5890 +#: builtin/merge.c:951
5891 msgid "No default upstream defined for the current branch."
5892 msgstr "Ingen standarduppström angiven för aktuell gren."
5893
5885 -#: builtin/merge.c:955
5894 +#: builtin/merge.c:956
5895 #, c-format
5896 msgid "No remote tracking branch for %s from %s"
5897 msgstr "Ingen fjärrspårande gren för %s från %s"
5898
5890 -#: builtin/merge.c:1042 builtin/merge.c:1199
5899 +#: builtin/merge.c:1043 builtin/merge.c:1200
5900 #, c-format
5901 msgid "%s - not something we can merge"
5902 msgstr "%s - inte något vi kan slå ihop"
5903
5895 -#: builtin/merge.c:1110
5904 +#: builtin/merge.c:1111
5905 msgid "There is no merge to abort (MERGE_HEAD missing)."
5906 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
5907
5899 -#: builtin/merge.c:1126 git-pull.sh:31
5908 +#: builtin/merge.c:1127 git-pull.sh:31
5909 msgid ""
5910 "You have not concluded your merge (MERGE_HEAD exists).\n"
5911 "Please, commit your changes before you can merge."
@@ -5904,11 +5913,11 @@ msgstr ""
5913 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
5914 "Checka in dina ändringar innan du kan slå ihop."
5915
5907 -#: builtin/merge.c:1129 git-pull.sh:34
5916 +#: builtin/merge.c:1130 git-pull.sh:34
5917 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5918 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
5919
5911 -#: builtin/merge.c:1133
5920 +#: builtin/merge.c:1134
5921 msgid ""
5922 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5923 "Please, commit your changes before you can merge."
@@ -5916,79 +5925,79 @@ msgstr ""
5925 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
5926 "Checka in dina ändringar innan du kan slå ihop."
5927
5919 -#: builtin/merge.c:1136
5928 +#: builtin/merge.c:1137
5929 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5930 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
5931
5923 -#: builtin/merge.c:1145
5932 +#: builtin/merge.c:1146
5933 msgid "You cannot combine --squash with --no-ff."
5934 msgstr "Du kan inte kombinera --squash med --no-ff."
5935
5927 -#: builtin/merge.c:1150
5936 +#: builtin/merge.c:1151
5937 msgid "You cannot combine --no-ff with --ff-only."
5938 msgstr "Du kan inte kombinera --no-ff med --ff-only."
5939
5931 -#: builtin/merge.c:1157
5940 +#: builtin/merge.c:1158
5941 msgid "No commit specified and merge.defaultToUpstream not set."
5942 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
5943
5935 -#: builtin/merge.c:1189
5944 +#: builtin/merge.c:1190
5945 msgid "Can merge only exactly one commit into empty head"
5946 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
5947
5939 -#: builtin/merge.c:1192
5948 +#: builtin/merge.c:1193
5949 msgid "Squash commit into empty head not supported yet"
5950 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
5951
5943 -#: builtin/merge.c:1194
5952 +#: builtin/merge.c:1195
5953 msgid "Non-fast-forward commit does not make sense into an empty head"
5954 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
5955
5947 -#: builtin/merge.c:1309
5956 +#: builtin/merge.c:1311
5957 #, c-format
5958 msgid "Updating %s..%s\n"
5959 msgstr "Uppdaterar %s..%s\n"
5960
5952 -#: builtin/merge.c:1348
5961 +#: builtin/merge.c:1350
5962 #, c-format
5963 msgid "Trying really trivial in-index merge...\n"
5964 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
5965
5957 -#: builtin/merge.c:1355
5966 +#: builtin/merge.c:1357
5967 #, c-format
5968 msgid "Nope.\n"
5969 msgstr "Nej.\n"
5970
5962 -#: builtin/merge.c:1387
5971 +#: builtin/merge.c:1389
5972 msgid "Not possible to fast-forward, aborting."
5973 msgstr "Kan inte snabbspola, avbryter."
5974
5966 -#: builtin/merge.c:1410 builtin/merge.c:1489
5975 +#: builtin/merge.c:1412 builtin/merge.c:1491
5976 #, c-format
5977 msgid "Rewinding the tree to pristine...\n"
5978 msgstr "Återspolar trädet till orört...\n"
5979
5971 -#: builtin/merge.c:1414
5980 +#: builtin/merge.c:1416
5981 #, c-format
5982 msgid "Trying merge strategy %s...\n"
5983 msgstr "Försöker sammanslagninsstrategin %s...\n"
5984
5976 -#: builtin/merge.c:1480
5985 +#: builtin/merge.c:1482
5986 #, c-format
5987 msgid "No merge strategy handled the merge.\n"
5988 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
5989
5981 -#: builtin/merge.c:1482
5990 +#: builtin/merge.c:1484
5991 #, c-format
5992 msgid "Merge with strategy %s failed.\n"
5993 msgstr "Sammanslagning med strategin %s misslyckades.\n"
5994
5986 -#: builtin/merge.c:1491
5995 +#: builtin/merge.c:1493
5996 #, c-format
5997 msgid "Using the %s to prepare resolving by hand.\n"
5998 msgstr "Använder %s för att förbereda lösning för hand.\n"
5999
5991 -#: builtin/merge.c:1503
6000 +#: builtin/merge.c:1505
6001 #, c-format
6002 msgid "Automatic merge went well; stopped before committing as requested\n"
6003 msgstr ""
@@ -6358,7 +6367,7 @@ msgstr "kunde inte öppna eller läsa \"%s\""
6367 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6368 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6369 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6361 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
6370 +#: builtin/notes.c:971 builtin/tag.c:558
6371 #, c-format
6372 msgid "Failed to resolve '%s' as a valid ref."
6373 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -6898,22 +6907,30 @@ msgstr ""
6907 "\"git pull\") innan du sänder igen.\n"
6908 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
6909
6901 -#: builtin/push.c:258
6910 +#: builtin/push.c:224
6911 +msgid ""
6912 +"Updates were rejected because the destination reference already exists\n"
6913 +"in the remote."
6914 +msgstr ""
6915 +"Uppdateringarna avvisades eftersom målreferensen redan finns på\n"
6916 +"fjärren."
6917 +
6918 +#: builtin/push.c:269
6919 #, c-format
6920 msgid "Pushing to %s\n"
6921 msgstr "Sänder till %s\n"
6922
6906 -#: builtin/push.c:262
6923 +#: builtin/push.c:273
6924 #, c-format
6925 msgid "failed to push some refs to '%s'"
6926 msgstr "misslyckades sända vissa referenser till \"%s\""
6927
6911 -#: builtin/push.c:294
6928 +#: builtin/push.c:302
6929 #, c-format
6930 msgid "bad repository '%s'"
6931 msgstr "felaktigt arkiv \"%s\""
6932
6916 -#: builtin/push.c:295
6933 +#: builtin/push.c:303
6934 msgid ""
6935 "No configured push destination.\n"
6936 "Either specify the URL from the command-line or configure a remote "
@@ -6934,79 +6951,79 @@ msgstr ""
6951 "\n"
6952 " git push <namn>\n"
6953
6937 -#: builtin/push.c:310
6954 +#: builtin/push.c:318
6955 msgid "--all and --tags are incompatible"
6956 msgstr "--all och --tags är inkompatibla"
6957
6941 -#: builtin/push.c:311
6958 +#: builtin/push.c:319
6959 msgid "--all can't be combined with refspecs"
6960 msgstr "--all kan inte kombineras med referensspecifikationer"
6961
6945 -#: builtin/push.c:316
6962 +#: builtin/push.c:324
6963 msgid "--mirror and --tags are incompatible"
6964 msgstr "--mirror och --tags är inkompatibla"
6965
6949 -#: builtin/push.c:317
6966 +#: builtin/push.c:325
6967 msgid "--mirror can't be combined with refspecs"
6968 msgstr "--mirror kan inte kombineras med referensspecifikationer"
6969
6953 -#: builtin/push.c:322
6970 +#: builtin/push.c:330
6971 msgid "--all and --mirror are incompatible"
6972 msgstr "--all och --mirror är inkompatibla"
6973
6957 -#: builtin/push.c:382
6974 +#: builtin/push.c:390
6975 msgid "repository"
6976 msgstr "arkiv"
6977
6961 -#: builtin/push.c:383
6978 +#: builtin/push.c:391
6979 msgid "push all refs"
6980 msgstr "sänd alla referenser"
6981
6965 -#: builtin/push.c:384
6982 +#: builtin/push.c:392
6983 msgid "mirror all refs"
6984 msgstr "spegla alla referenser"
6985
6969 -#: builtin/push.c:386
6986 +#: builtin/push.c:394
6987 msgid "delete refs"
6988 msgstr "ta bort referenser"
6989
6973 -#: builtin/push.c:387
6990 +#: builtin/push.c:395
6991 msgid "push tags (can't be used with --all or --mirror)"
6992 msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
6993
6977 -#: builtin/push.c:390
6994 +#: builtin/push.c:398
6995 msgid "force updates"
6996 msgstr "tvinga uppdateringar"
6997
6981 -#: builtin/push.c:391
6998 +#: builtin/push.c:399
6999 msgid "check"
7000 msgstr "kontrollera"
7001
6985 -#: builtin/push.c:392
7002 +#: builtin/push.c:400
7003 msgid "control recursive pushing of submodules"
7004 msgstr "styr rekursiv insändning av undermoduler"
7005
6989 -#: builtin/push.c:394
7006 +#: builtin/push.c:402
7007 msgid "use thin pack"
7008 msgstr "använd tunna paket"
7009
6993 -#: builtin/push.c:395 builtin/push.c:396
7010 +#: builtin/push.c:403 builtin/push.c:404
7011 msgid "receive pack program"
7012 msgstr "program för att ta emot paket"
7013
6997 -#: builtin/push.c:397
7014 +#: builtin/push.c:405
7015 msgid "set upstream for git pull/status"
7016 msgstr "ställ in uppström för git pull/status"
7017
7001 -#: builtin/push.c:400
7018 +#: builtin/push.c:408
7019 msgid "prune locally removed refs"
7020 msgstr "ta bort lokalt borttagna referenser"
7021
7005 -#: builtin/push.c:410
7022 +#: builtin/push.c:418
7023 msgid "--delete is incompatible with --all, --mirror and --tags"
7024 msgstr "--delete är imkompatibel med --all, --mirror och --tags"
7025
7009 -#: builtin/push.c:412
7026 +#: builtin/push.c:420
7027 msgid "--delete doesn't make sense without any refs"
7028 msgstr "--delete kan inte användas utan referenser"
7029
@@ -7617,12 +7634,12 @@ msgstr ""
7634 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
7635
7636 #: builtin/reset.c:26
7620 -msgid "git reset [-q] <commit> [--] <paths>..."
7621 -msgstr "git reset [-q] <incheckning> [--] <sökvägar>..."
7637 +msgid "git reset [-q] <tree-ish> [--] <paths>..."
7638 +msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..."
7639
7640 #: builtin/reset.c:27
7624 -msgid "git reset --patch [<commit>] [--] [<paths>...]"
7625 -msgstr "git reset --patch [<incheckning>] [--] [<sökvägar>...]"
7641 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7642 +msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
7643
7644 #: builtin/reset.c:33
7645 msgid "mixed"
@@ -7644,90 +7661,96 @@ msgstr "sammanslagning"
7661 msgid "keep"
7662 msgstr "behåll"
7663
7647 -#: builtin/reset.c:77
7664 +#: builtin/reset.c:73
7665 msgid "You do not have a valid HEAD."
7666 msgstr "Du har inte en giltig HEAD."
7667
7651 -#: builtin/reset.c:79
7668 +#: builtin/reset.c:75
7669 msgid "Failed to find tree of HEAD."
7670 msgstr "Kunde inte hitta träder för HEAD."
7671
7655 -#: builtin/reset.c:85
7672 +#: builtin/reset.c:81
7673 #, c-format
7674 msgid "Failed to find tree of %s."
7675 msgstr "Kunde inte hitta träder för %s."
7676
7660 -#: builtin/reset.c:96
7661 -msgid "Could not write new index file."
7662 -msgstr "Kunde inte skriva ny indexfil."
7663 -
7664 -#: builtin/reset.c:106
7677 +#: builtin/reset.c:98
7678 #, c-format
7679 msgid "HEAD is now at %s"
7680 msgstr "HEAD är nu på %s"
7681
7669 -#: builtin/reset.c:130
7670 -msgid "Could not read index"
7671 -msgstr "Kunde inte läsa indexet"
7672 -
7673 -#: builtin/reset.c:133
7674 -msgid "Unstaged changes after reset:"
7675 -msgstr "Oköade ändringar efter återställning:"
7676 -
7677 -#: builtin/reset.c:223
7682 +#: builtin/reset.c:169
7683 #, c-format
7684 msgid "Cannot do a %s reset in the middle of a merge."
7685 msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
7686
7682 -#: builtin/reset.c:238
7687 +#: builtin/reset.c:248
7688 msgid "be quiet, only report errors"
7689 msgstr "var tyst, rapportera endast fel"
7690
7686 -#: builtin/reset.c:240
7691 +#: builtin/reset.c:250
7692 msgid "reset HEAD and index"
7693 msgstr "återställ HEAD och index"
7694
7690 -#: builtin/reset.c:241
7695 +#: builtin/reset.c:251
7696 msgid "reset only HEAD"
7697 msgstr "återställ endast HEAD"
7698
7694 -#: builtin/reset.c:243 builtin/reset.c:245
7699 +#: builtin/reset.c:253 builtin/reset.c:255
7700 msgid "reset HEAD, index and working tree"
7701 msgstr "återställ HEAD, index och arbetskatalog"
7702
7698 -#: builtin/reset.c:247
7703 +#: builtin/reset.c:257
7704 msgid "reset HEAD but keep local changes"
7705 msgstr "återställ HEAD men behåll lokala ändringar"
7706
7702 -#: builtin/reset.c:303
7707 +#: builtin/reset.c:275
7708 +#, c-format
7709 +msgid "Failed to resolve '%s' as a valid revision."
7710 +msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
7711 +
7712 +#: builtin/reset.c:278 builtin/reset.c:286
7713 #, c-format
7714 msgid "Could not parse object '%s'."
7715 msgstr "Kan inte tolka objektet \"%s\""
7716
7707 -#: builtin/reset.c:308
7717 +#: builtin/reset.c:283
7718 +#, c-format
7719 +msgid "Failed to resolve '%s' as a valid tree."
7720 +msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
7721 +
7722 +#: builtin/reset.c:292
7723 msgid "--patch is incompatible with --{hard,mixed,soft}"
7724 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
7725
7711 -#: builtin/reset.c:317
7726 +#: builtin/reset.c:301
7727 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7728 msgstr ""
7729 "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
7730
7716 -#: builtin/reset.c:319
7731 +#: builtin/reset.c:303
7732 #, c-format
7733 msgid "Cannot do %s reset with paths."
7734 msgstr "Kan inte göra %s återställning med sökvägar."
7735
7721 -#: builtin/reset.c:331
7736 +#: builtin/reset.c:313
7737 #, c-format
7738 msgid "%s reset is not allowed in a bare repository"
7739 msgstr "%s återställning tillåts inte i ett naket arkiv"
7740
7726 -#: builtin/reset.c:347
7741 +#: builtin/reset.c:333
7742 #, c-format
7743 msgid "Could not reset index file to revision '%s'."
7744 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
7745
7746 +#: builtin/reset.c:339
7747 +msgid "Unstaged changes after reset:"
7748 +msgstr "Oköade ändringar efter återställning:"
7749 +
7750 +#: builtin/reset.c:344
7751 +msgid "Could not write new index file."
7752 +msgstr "Kunde inte skriva ny indexfil."
7753 +
7754 #: builtin/rev-parse.c:339
7755 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7756 msgstr "git rev-parse --parseopt [options] -- [<argument>...]"
@@ -7920,28 +7943,28 @@ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
7943 msgstr ""
7944 "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]"
7945
7923 -#: builtin/shortlog.c:157
7946 +#: builtin/shortlog.c:133
7947 #, c-format
7948 msgid "Missing author: %s"
7949 msgstr "Författare saknas: %s"
7950
7928 -#: builtin/shortlog.c:253
7951 +#: builtin/shortlog.c:229
7952 msgid "sort output according to the number of commits per author"
7953 msgstr "sortera utdata enligt antal incheckningar per författare"
7954
7932 -#: builtin/shortlog.c:255
7955 +#: builtin/shortlog.c:231
7956 msgid "Suppress commit descriptions, only provides commit count"
7957 msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
7958
7936 -#: builtin/shortlog.c:257
7959 +#: builtin/shortlog.c:233
7960 msgid "Show the email address of each author"
7961 msgstr "Visa e-postadress för varje författare"
7962
7940 -#: builtin/shortlog.c:258
7963 +#: builtin/shortlog.c:234
7964 msgid "w[,i1[,i2]]"
7965 msgstr "w[,i1[,i2]]"
7966
7944 -#: builtin/shortlog.c:259
7967 +#: builtin/shortlog.c:235
7968 msgid "Linewrap output"
7969 msgstr "Radbryt utdata"
7970
@@ -8495,15 +8518,15 @@ msgstr ""
8518 msgid "no-op (backward compatibility)"
8519 msgstr "ingen funktion (bakåtkompatibilitet)"
8520
8498 -#: parse-options.h:228
8521 +#: parse-options.h:232
8522 msgid "be more verbose"
8523 msgstr "var mer pratsam"
8524
8502 -#: parse-options.h:230
8525 +#: parse-options.h:234
8526 msgid "be more quiet"
8527 msgstr "var mer tyst"
8528
8506 -#: parse-options.h:236
8529 +#: parse-options.h:240
8530 msgid "use <n> digits to display SHA-1s"
8531 msgstr "använd <n> siffror för att visa SHA-1:or"
8532
@@ -9212,38 +9235,38 @@ msgstr "Inget grennamn angavs"
9235 msgid "(To restore them type \"git stash apply\")"
9236 msgstr "(För att återställa dem, skriv \"git stash apply\")"
9237
9215 -#: git-submodule.sh:89
9238 +#: git-submodule.sh:90
9239 #, sh-format
9240 msgid "cannot strip one component off url '$remoteurl'"
9241 msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
9242
9220 -#: git-submodule.sh:168
9243 +#: git-submodule.sh:195
9244 #, sh-format
9245 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9246 msgstr ""
9247 "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
9248
9226 -#: git-submodule.sh:211
9249 +#: git-submodule.sh:238
9250 #, sh-format
9251 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9252 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
9253
9231 -#: git-submodule.sh:223
9254 +#: git-submodule.sh:250
9255 #, sh-format
9256 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9257 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"
9258
9236 -#: git-submodule.sh:316
9259 +#: git-submodule.sh:343
9260 #, sh-format
9261 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9262 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
9263
9241 -#: git-submodule.sh:333
9264 +#: git-submodule.sh:360
9265 #, sh-format
9266 msgid "'$sm_path' already exists in the index"
9267 msgstr "\"$sm_path\" finns redan i indexet"
9268
9246 -#: git-submodule.sh:337
9269 +#: git-submodule.sh:364
9270 #, sh-format
9271 msgid ""
9272 "The following path is ignored by one of your .gitignore files:\n"
@@ -9254,22 +9277,22 @@ msgstr ""
9277 "$sm_path\n"
9278 "Använd -f om du verkligen vill lägga till den"
9279
9257 -#: git-submodule.sh:355
9280 +#: git-submodule.sh:382
9281 #, sh-format
9282 msgid "Adding existing repo at '$sm_path' to the index"
9283 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
9284
9262 -#: git-submodule.sh:357
9285 +#: git-submodule.sh:384
9286 #, sh-format
9287 msgid "'$sm_path' already exists and is not a valid git repo"
9288 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
9289
9267 -#: git-submodule.sh:365
9290 +#: git-submodule.sh:392
9291 #, sh-format
9292 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9293 msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
9294
9272 -#: git-submodule.sh:367
9295 +#: git-submodule.sh:394
9296 #, sh-format
9297 msgid ""
9298 "If you want to reuse this local git directory instead of cloning again from"
@@ -9277,14 +9300,14 @@ msgstr ""
9300 "För att återanvända den lokala git-katalogen istället för att på nytt klona "
9301 "från"
9302
9280 -#: git-submodule.sh:369
9303 +#: git-submodule.sh:396
9304 #, sh-format
9305 msgid ""
9306 "use the '--force' option. If the local git directory is not the correct repo"
9307 msgstr ""
9308 "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"
9309
9287 -#: git-submodule.sh:370
9310 +#: git-submodule.sh:397
9311 #, sh-format
9312 msgid ""
9313 "or you are unsure what this means choose another name with the '--name' "
@@ -9293,59 +9316,59 @@ msgstr ""
9316 "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"
9317 "\"."
9318
9296 -#: git-submodule.sh:372
9319 +#: git-submodule.sh:399
9320 #, sh-format
9321 msgid "Reactivating local git directory for submodule '$sm_name'."
9322 msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
9323
9301 -#: git-submodule.sh:384
9324 +#: git-submodule.sh:411
9325 #, sh-format
9326 msgid "Unable to checkout submodule '$sm_path'"
9327 msgstr "Kan inte checka ut undermodulen \"$sm_path\""
9328
9306 -#: git-submodule.sh:389
9329 +#: git-submodule.sh:416
9330 #, sh-format
9331 msgid "Failed to add submodule '$sm_path'"
9332 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
9333
9311 -#: git-submodule.sh:394
9334 +#: git-submodule.sh:425
9335 #, sh-format
9336 msgid "Failed to register submodule '$sm_path'"
9337 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
9338
9316 -#: git-submodule.sh:437
9339 +#: git-submodule.sh:468
9340 #, sh-format
9341 msgid "Entering '$prefix$sm_path'"
9342 msgstr "Går in i \"$prefix$sm_path\""
9343
9321 -#: git-submodule.sh:451
9344 +#: git-submodule.sh:482
9345 #, sh-format
9346 msgid "Stopping at '$sm_path'; script returned non-zero status."
9347 msgstr ""
9348 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."
9349
9327 -#: git-submodule.sh:495
9350 +#: git-submodule.sh:526
9351 #, sh-format
9352 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9353 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"
9354
9332 -#: git-submodule.sh:504
9355 +#: git-submodule.sh:535
9356 #, sh-format
9357 msgid "Failed to register url for submodule path '$sm_path'"
9358 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""
9359
9337 -#: git-submodule.sh:506
9360 +#: git-submodule.sh:537
9361 #, sh-format
9362 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9363 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""
9364
9342 -#: git-submodule.sh:514
9365 +#: git-submodule.sh:545
9366 #, sh-format
9367 msgid "Failed to register update mode for submodule path '$sm_path'"
9368 msgstr ""
9369 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""
9370
9348 -#: git-submodule.sh:614
9371 +#: git-submodule.sh:649
9372 #, sh-format
9373 msgid ""
9374 "Submodule path '$sm_path' not initialized\n"
@@ -9354,93 +9377,108 @@ msgstr ""
9377 "Undermodulen \"$sm_path\" har inte initierats\n"
9378 "Kanske du vill köra \"update --init\"?"
9379
9357 -#: git-submodule.sh:627
9380 +#: git-submodule.sh:662
9381 #, sh-format
9382 msgid "Unable to find current revision in submodule path '$sm_path'"
9383 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""
9384
9362 -#: git-submodule.sh:646
9385 +#: git-submodule.sh:671 git-submodule.sh:695
9386 #, sh-format
9387 msgid "Unable to fetch in submodule path '$sm_path'"
9388 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
9389
9367 -#: git-submodule.sh:660
9390 +#: git-submodule.sh:709
9391 #, sh-format
9392 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9393 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""
9394
9372 -#: git-submodule.sh:661
9395 +#: git-submodule.sh:710
9396 #, sh-format
9397 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9398 msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""
9399
9377 -#: git-submodule.sh:666
9400 +#: git-submodule.sh:715
9401 #, sh-format
9402 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9403 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""
9404
9382 -#: git-submodule.sh:667
9405 +#: git-submodule.sh:716
9406 #, sh-format
9407 msgid "Submodule path '$sm_path': merged in '$sha1'"
9408 msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""
9409
9387 -#: git-submodule.sh:672
9410 +#: git-submodule.sh:721
9411 #, sh-format
9412 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9413 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""
9414
9392 -#: git-submodule.sh:673
9415 +#: git-submodule.sh:722
9416 #, sh-format
9417 msgid "Submodule path '$sm_path': checked out '$sha1'"
9418 msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""
9419
9397 -#: git-submodule.sh:695 git-submodule.sh:1017
9420 +#: git-submodule.sh:744 git-submodule.sh:1066
9421 #, sh-format
9422 msgid "Failed to recurse into submodule path '$sm_path'"
9423 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
9424
9402 -#: git-submodule.sh:803
9425 +#: git-submodule.sh:852
9426 msgid "The --cached option cannot be used with the --files option"
9427 msgstr "Flaggan --cached kan inte användas med flaggan --files"
9428
9429 #. unexpected type
9407 -#: git-submodule.sh:843
9430 +#: git-submodule.sh:892
9431 #, sh-format
9432 msgid "unexpected mode $mod_dst"
9433 msgstr "oväntat läge $mod_dst"
9434
9412 -#: git-submodule.sh:861
9435 +#: git-submodule.sh:910
9436 #, sh-format
9437 msgid " Warn: $name doesn't contain commit $sha1_src"
9438 msgstr " Varning: $name innehåller inte incheckning $sha1_src"
9439
9417 -#: git-submodule.sh:864
9440 +#: git-submodule.sh:913
9441 #, sh-format
9442 msgid " Warn: $name doesn't contain commit $sha1_dst"
9443 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"
9444
9422 -#: git-submodule.sh:867
9445 +#: git-submodule.sh:916
9446 #, sh-format
9447 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9448 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"
9449
9427 -#: git-submodule.sh:892
9450 +#: git-submodule.sh:941
9451 msgid "blob"
9452 msgstr "blob"
9453
9431 -#: git-submodule.sh:930
9454 +#: git-submodule.sh:979
9455 msgid "# Submodules changed but not updated:"
9456 msgstr "# Undermoduler ändrade men inte uppdaterade:"
9457
9435 -#: git-submodule.sh:932
9458 +#: git-submodule.sh:981
9459 msgid "# Submodule changes to be committed:"
9460 msgstr "# Undermodulers ändringar att checka in:"
9461
9439 -#: git-submodule.sh:1080
9462 +#: git-submodule.sh:1129
9463 #, sh-format
9464 msgid "Synchronizing submodule url for '$prefix$sm_path'"
9465 msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""
9466
9467 +#~ msgid "You do not have a valid HEAD"
9468 +#~ msgstr "Du har ingen giltig HEAD"
9469 +
9470 +#~ msgid "oops"
9471 +#~ msgstr "hoppsan"
9472 +
9473 +#~ msgid "Would not remove %s\n"
9474 +#~ msgstr "Skulle inte ta bort %s\n"
9475 +
9476 +#~ msgid "Not removing %s\n"
9477 +#~ msgstr "Tar inte bort %s\n"
9478 +
9479 +#~ msgid "Could not read index"
9480 +#~ msgstr "Kunde inte läsa indexet"
9481 +
9482 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9483 #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])"
9484