@matheusbsbs / matheus-bagliano / commits / 9aaa979a24

Update Swedish translation (1095t0f0u)

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

Peter Krefting committed Jul 4, 2012 at 19:34 UTC 9aaa979a24b037fb1af96c0c6a7aa50ee48f7507
1 file changed +334 -211
po/sv.po
+334 -211
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 1.7.10\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2012-06-08 10:20+0800\n"
11 -"PO-Revision-Date: 2012-07-01 22:59+0100\n"
10 +"POT-Creation-Date: 2012-07-03 10:23+0800\n"
11 +"PO-Revision-Date: 2012-07-04 19:33+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"
@@ -57,8 +57,8 @@ msgstr "kunde inte öppna \"%s\""
57 msgid "Repository lacks these prerequisite commits:"
58 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
59
60 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
61 -#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
60 +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
61 +#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
62 #: builtin/shortlog.c:181
63 msgid "revision walk setup failed"
64 msgstr "misslyckades skapa revisionstraversering"
@@ -71,44 +71,48 @@ msgstr[0] "Paketet (bundlen) innehåller %d referens"
71 msgstr[1] "Paketet (bundlen) innehåller %d referenser"
72
73 #: bundle.c:192
74 +msgid "The bundle records a complete history."
75 +msgstr "Paketet (bundlen) beskriver en komplett historik."
76 +
77 +#: bundle.c:195
78 #, c-format
79 msgid "The bundle requires this ref"
80 msgid_plural "The bundle requires these %d refs"
81 msgstr[0] "Paketet (bundlen) kräver denna referens"
82 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"
83
80 -#: bundle.c:290
84 +#: bundle.c:294
85 msgid "rev-list died"
86 msgstr "rev-list dog"
87
84 -#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
88 +#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
89 #, c-format
90 msgid "unrecognized argument: %s"
91 msgstr "okänt argument: %s"
92
89 -#: bundle.c:331
93 +#: bundle.c:335
94 #, c-format
95 msgid "ref '%s' is excluded by the rev-list options"
96 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
97
94 -#: bundle.c:376
98 +#: bundle.c:380
99 msgid "Refusing to create empty bundle."
100 msgstr "Vägrar skapa ett tomt paket (bundle)."
101
98 -#: bundle.c:394
102 +#: bundle.c:398
103 msgid "Could not spawn pack-objects"
104 msgstr "Kunde inte starta pack-objects"
105
102 -#: bundle.c:412
106 +#: bundle.c:416
107 msgid "pack-objects died"
108 msgstr "pack-objects misslyckades"
109
106 -#: bundle.c:415
110 +#: bundle.c:419
111 #, c-format
112 msgid "cannot create '%s'"
113 msgstr "kan inte skapa \"%s\""
114
111 -#: bundle.c:437
115 +#: bundle.c:441
116 msgid "index-pack died"
117 msgstr "index-pack dog"
118
@@ -287,16 +291,16 @@ msgstr "\"%s\": %s"
291 msgid "'%s': short read %s"
292 msgstr "\"%s\": kort läsning %s"
293
290 -#: help.c:207
294 +#: help.c:208
295 #, c-format
296 msgid "available git commands in '%s'"
297 msgstr "git-kommandon tillgängliga i \"%s\""
298
295 -#: help.c:214
299 +#: help.c:215
300 msgid "git commands available from elsewhere on your $PATH"
301 msgstr "git-kommandon från andra platser i din $PATH"
302
299 -#: help.c:270
303 +#: help.c:271
304 #, c-format
305 msgid ""
306 "'%s' appears to be a git command, but we were not\n"
@@ -305,11 +309,11 @@ msgstr ""
309 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
310 "köra det. Kanske git-%s är trasigt?"
311
308 -#: help.c:327
312 +#: help.c:328
313 msgid "Uh oh. Your system reports no Git commands at all."
314 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
315
312 -#: help.c:349
316 +#: help.c:350
317 #, c-format
318 msgid ""
319 "WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -318,17 +322,17 @@ msgstr ""
322 "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
323 "Fortsätter under förutsättningen att du menade \"%s\""
324
321 -#: help.c:354
325 +#: help.c:355
326 #, c-format
327 msgid "in %0.1f seconds automatically..."
328 msgstr "automatiskt om %0.1f sekunder..."
329
326 -#: help.c:361
330 +#: help.c:362
331 #, c-format
332 msgid "git: '%s' is not a git command. See 'git --help'."
333 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
334
331 -#: help.c:365
335 +#: help.c:366
336 msgid ""
337 "\n"
338 "Did you mean this?"
@@ -664,240 +668,343 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
668 msgid "no such user"
669 msgstr "okänd användare"
670
667 -#: wt-status.c:135
671 +#: wt-status.c:141
672 msgid "Unmerged paths:"
673 msgstr "Ej sammanslagna sökvägar:"
674
671 -#: wt-status.c:141 wt-status.c:158
675 +#: wt-status.c:168 wt-status.c:195
676 #, c-format
677 msgid " (use \"git reset %s <file>...\" to unstage)"
678 msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
679
676 -#: wt-status.c:143 wt-status.c:160
680 +#: wt-status.c:170 wt-status.c:197
681 msgid " (use \"git rm --cached <file>...\" to unstage)"
682 msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
683
680 -#: wt-status.c:144
684 +#: wt-status.c:174
685 +msgid " (use \"git add <file>...\" to mark resolution)"
686 +msgstr " (använd \"git add <fil>...\" för att ange lösning)"
687 +
688 +#: wt-status.c:176 wt-status.c:180
689 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
690 msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
691
684 -#: wt-status.c:152
692 +#: wt-status.c:178
693 +msgid " (use \"git rm <file>...\" to mark resolution)"
694 +msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
695 +
696 +#: wt-status.c:189
697 msgid "Changes to be committed:"
698 msgstr "Ändringar att checka in:"
699
688 -#: wt-status.c:170
700 +#: wt-status.c:207
701 msgid "Changes not staged for commit:"
702 msgstr "Ändringar ej i incheckningskön:"
703
692 -#: wt-status.c:174
704 +#: wt-status.c:211
705 msgid " (use \"git add <file>...\" to update what will be committed)"
706 msgstr ""
707 " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
708
697 -#: wt-status.c:176
709 +#: wt-status.c:213
710 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
711 msgstr ""
712 " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
713
702 -#: wt-status.c:177
714 +#: wt-status.c:214
715 msgid ""
716 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
717 msgstr ""
718 " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
719 "arbetskatalogen)"
720
709 -#: wt-status.c:179
721 +#: wt-status.c:216
722 msgid " (commit or discard the untracked or modified content in submodules)"
723 msgstr ""
724 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
725
726 # %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
715 -#: wt-status.c:188
727 +#: wt-status.c:225
728 #, c-format
729 msgid "%s files:"
730 msgstr "%se filer:"
731
720 -#: wt-status.c:191
732 +#: wt-status.c:228
733 #, c-format
734 msgid " (use \"git %s <file>...\" to include in what will be committed)"
735 msgstr ""
736 " (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"
737
726 -#: wt-status.c:208
738 +#: wt-status.c:245
739 msgid "bug"
740 msgstr "programfel"
741
730 -#: wt-status.c:213
742 +#: wt-status.c:250
743 msgid "both deleted:"
744 msgstr "borttaget av bägge:"
745
734 -#: wt-status.c:214
746 +#: wt-status.c:251
747 msgid "added by us:"
748 msgstr "tillagt av oss:"
749
738 -#: wt-status.c:215
750 +#: wt-status.c:252
751 msgid "deleted by them:"
752 msgstr "borttaget av dem:"
753
742 -#: wt-status.c:216
754 +#: wt-status.c:253
755 msgid "added by them:"
756 msgstr "tillagt av dem:"
757
746 -#: wt-status.c:217
758 +#: wt-status.c:254
759 msgid "deleted by us:"
760 msgstr "borttaget av oss:"
761
750 -#: wt-status.c:218
762 +#: wt-status.c:255
763 msgid "both added:"
764 msgstr "tillagt av bägge:"
765
754 -#: wt-status.c:219
766 +#: wt-status.c:256
767 msgid "both modified:"
768 msgstr "ändrat av bägge:"
769
758 -#: wt-status.c:249
770 +#: wt-status.c:286
771 msgid "new commits, "
772 msgstr "nya incheckningar, "
773
762 -#: wt-status.c:251
774 +#: wt-status.c:288
775 msgid "modified content, "
776 msgstr "ändrat innehåll, "
777
766 -#: wt-status.c:253
778 +#: wt-status.c:290
779 msgid "untracked content, "
780 msgstr "ospårat innehåll, "
781
770 -#: wt-status.c:267
782 +#: wt-status.c:304
783 #, c-format
784 msgid "new file: %s"
785 msgstr "ny fil: %s"
786
775 -#: wt-status.c:270
787 +#: wt-status.c:307
788 #, c-format
789 msgid "copied: %s -> %s"
790 msgstr "kopierad: %s -> %s"
791
780 -#: wt-status.c:273
792 +#: wt-status.c:310
793 #, c-format
794 msgid "deleted: %s"
795 msgstr "borttagen: %s"
796
785 -#: wt-status.c:276
797 +#: wt-status.c:313
798 #, c-format
799 msgid "modified: %s"
800 msgstr "ändrad: %s"
801
790 -#: wt-status.c:279
802 +#: wt-status.c:316
803 #, c-format
804 msgid "renamed: %s -> %s"
805 msgstr "namnbyte: %s -> %s"
806
795 -#: wt-status.c:282
807 +#: wt-status.c:319
808 #, c-format
809 msgid "typechange: %s"
810 msgstr "typbyte: %s"
811
800 -#: wt-status.c:285
812 +#: wt-status.c:322
813 #, c-format
814 msgid "unknown: %s"
815 msgstr "okänd: %s"
816
805 -#: wt-status.c:288
817 +#: wt-status.c:325
818 #, c-format
819 msgid "unmerged: %s"
820 msgstr "osammansl.: %s"
821
810 -#: wt-status.c:291
822 +#: wt-status.c:328
823 #, c-format
824 msgid "bug: unhandled diff status %c"
825 msgstr "programfel: diff-status %c ej hanterad"
826
815 -#: wt-status.c:737
827 +#: wt-status.c:786
828 +msgid "You have unmerged paths."
829 +msgstr "Du har ej sammanslagna sökvägar."
830 +
831 +#: wt-status.c:789 wt-status.c:913
832 +msgid " (fix conflicts and run \"git commit\")"
833 +msgstr " (rätta konflikter och kör \"git commit\")"
834 +
835 +#: wt-status.c:792
836 +msgid "All conflicts fixed but you are still merging."
837 +msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
838 +
839 +#: wt-status.c:795
840 +msgid " (use \"git commit\" to conclude merge)"
841 +msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
842 +
843 +#: wt-status.c:805
844 +msgid "You are in the middle of an am session."
845 +msgstr "Du är i mitten av en körning av \"git am\"."
846 +
847 +#: wt-status.c:808
848 +msgid "The current patch is empty."
849 +msgstr "Aktuell patch är tom."
850 +
851 +#: wt-status.c:812
852 +msgid " (fix conflicts and then run \"git am --resolved\")"
853 +msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
854 +
855 +#: wt-status.c:814
856 +msgid " (use \"git am --skip\" to skip this patch)"
857 +msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
858 +
859 +#: wt-status.c:816
860 +msgid " (use \"git am --abort\" to restore the original branch)"
861 +msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
862 +
863 +#: wt-status.c:874 wt-status.c:884
864 +msgid "You are currently rebasing."
865 +msgstr "Du håller på med en ombasering."
866 +
867 +#: wt-status.c:877
868 +msgid " (fix conflicts and then run \"git rebase --continue\")"
869 +msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
870 +
871 +#: wt-status.c:879
872 +msgid " (use \"git rebase --skip\" to skip this patch)"
873 +msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
874 +
875 +#: wt-status.c:881
876 +msgid " (use \"git rebase --abort\" to check out the original branch)"
877 +msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
878 +
879 +#: wt-status.c:887
880 +msgid " (all conflicts fixed: run \"git rebase --continue\")"
881 +msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
882 +
883 +#: wt-status.c:889
884 +msgid "You are currently splitting a commit during a rebase."
885 +msgstr "Du håller på att dela upp en incheckning i en ombasering."
886 +
887 +#: wt-status.c:892
888 +msgid " (Once your working directory is clean, run \"git rebase --continue\")"
889 +msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
890 +
891 +#: wt-status.c:894
892 +msgid "You are currently editing a commit during a rebase."
893 +msgstr "Du håller på att redigera en incheckning under en ombasering."
894 +
895 +#: wt-status.c:897
896 +msgid " (use \"git commit --amend\" to amend the current commit)"
897 +msgstr ""
898 +" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
899 +
900 +#: wt-status.c:899
901 +msgid ""
902 +" (use \"git rebase --continue\" once you are satisfied with your changes)"
903 +msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
904 +
905 +#: wt-status.c:909
906 +msgid "You are currently cherry-picking."
907 +msgstr "Du håller på med en \"cherry-pick\"."
908 +
909 +#: wt-status.c:916
910 +msgid " (all conflicts fixed: run \"git commit\")"
911 +msgstr " (alla konflikter har rättats: kör \"git commit\")"
912 +
913 +#: wt-status.c:925
914 +msgid "You are currently bisecting."
915 +msgstr "Du håller på med en \"bisect\"."
916 +
917 +#: wt-status.c:928
918 +msgid " (use \"git bisect reset\" to get back to the original branch)"
919 +msgstr ""
920 +" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
921 +
922 +#: wt-status.c:979
923 msgid "On branch "
924 msgstr "På grenen "
925
819 -#: wt-status.c:744
926 +#: wt-status.c:986
927 msgid "Not currently on any branch."
928 msgstr "Inte på någon gren för närvarande."
929
823 -#: wt-status.c:755
930 +#: wt-status.c:998
931 msgid "Initial commit"
932 msgstr "Första incheckning"
933
827 -#: wt-status.c:769
934 +#: wt-status.c:1012
935 msgid "Untracked"
936 msgstr "Ospårad"
937
831 -#: wt-status.c:771
938 +#: wt-status.c:1014
939 msgid "Ignored"
940 msgstr "Ignorerad"
941
942 # %s är nästa sträng eller tom.
836 -#: wt-status.c:773
943 +#: wt-status.c:1016
944 #, c-format
945 msgid "Untracked files not listed%s"
946 msgstr "Ospårade filer visas ej%s"
947
841 -#: wt-status.c:775
948 +#: wt-status.c:1018
949 msgid " (use -u option to show untracked files)"
950 msgstr " (använd flaggan -u för att visa ospårade filer)"
951
845 -#: wt-status.c:781
952 +#: wt-status.c:1024
953 msgid "No changes"
954 msgstr "Inga ändringar"
955
849 -#: wt-status.c:785
956 +#: wt-status.c:1028
957 #, c-format
958 msgid "no changes added to commit%s\n"
959 msgstr "inga ändringar att checka in%s\n"
960
854 -#: wt-status.c:787
961 +#: wt-status.c:1030
962 msgid " (use \"git add\" and/or \"git commit -a\")"
963 msgstr " (använd \"git add\" och/eller \"git commit -a\")"
964
858 -#: wt-status.c:789
965 +#: wt-status.c:1032
966 #, c-format
967 msgid "nothing added to commit but untracked files present%s\n"
968 msgstr "inget köat för incheckning, men ospårade filer finns%s\n"
969
863 -#: wt-status.c:791
970 +#: wt-status.c:1034
971 msgid " (use \"git add\" to track)"
972 msgstr " (använd \"git add\" för att spåra)"
973
867 -#: wt-status.c:793 wt-status.c:796 wt-status.c:799
974 +#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
975 #, c-format
976 msgid "nothing to commit%s\n"
977 msgstr "inget att checka in%s\n"
978
872 -#: wt-status.c:794
979 +#: wt-status.c:1037
980 msgid " (create/copy files and use \"git add\" to track)"
981 msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"
982
876 -#: wt-status.c:797
983 +#: wt-status.c:1040
984 msgid " (use -u to show untracked files)"
985 msgstr " (använd -u för att visa ospårade filer)"
986
880 -#: wt-status.c:800
987 +#: wt-status.c:1043
988 msgid " (working directory clean)"
989 msgstr " (arbetskatalogen ren)"
990
884 -#: wt-status.c:908
991 +#: wt-status.c:1151
992 msgid "HEAD (no branch)"
993 msgstr "HEAD (ingen gren)"
994
888 -#: wt-status.c:914
995 +#: wt-status.c:1157
996 msgid "Initial commit on "
997 msgstr "Första incheckning på "
998
892 -#: wt-status.c:929
999 +#: wt-status.c:1172
1000 msgid "behind "
1001 msgstr "efter "
1002
896 -#: wt-status.c:932 wt-status.c:935
1003 +#: wt-status.c:1175 wt-status.c:1178
1004 msgid "ahead "
1005 msgstr "före "
1006
900 -#: wt-status.c:937
1007 +#: wt-status.c:1180
1008 msgid ", behind "
1009 msgstr ", efter "
1010
@@ -924,7 +1031,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
1031 msgid "Unstaged changes after refreshing the index:"
1032 msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
1033
927 -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
1034 +#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1035 #, c-format
1036 msgid "pathspec '%s' did not match any files"
1037 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1001,7 +1108,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"
1108 msgid "index file corrupt"
1109 msgstr "indexfilen trasig"
1110
1004 -#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1111 +#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1112 msgid "Unable to write new index file"
1113 msgstr "Kunde inte skriva ny indexfil"
1114
@@ -2550,22 +2657,22 @@ msgstr "ogiltig flagga: %s"
2657 msgid "Not a git repository"
2658 msgstr "Inte ett git-arkiv"
2659
2553 -#: builtin/diff.c:347
2660 +#: builtin/diff.c:341
2661 #, c-format
2662 msgid "invalid object '%s' given."
2663 msgstr "objektet \"%s\" som angavs är felaktigt."
2664
2558 -#: builtin/diff.c:352
2665 +#: builtin/diff.c:346
2666 #, c-format
2667 msgid "more than %d trees given: '%s'"
2668 msgstr "mer än %d träd angavs: \"%s\""
2669
2563 -#: builtin/diff.c:362
2670 +#: builtin/diff.c:356
2671 #, c-format
2672 msgid "more than two blobs given: '%s'"
2673 msgstr "mer än två blobbar angavs: \"%s\""
2674
2568 -#: builtin/diff.c:370
2675 +#: builtin/diff.c:364
2676 #, c-format
2677 msgid "unhandled object '%s' given."
2678 msgstr "ej hanterat objekt \"%s\" angavs."
@@ -2815,30 +2922,30 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
2922 msgid "both --cached and trees are given."
2923 msgstr "både --cached och träd angavs."
2924
2818 -#: builtin/help.c:59
2925 +#: builtin/help.c:63
2926 #, c-format
2927 msgid "unrecognized help format '%s'"
2928 msgstr "okänt hjälpformat: %s"
2929
2823 -#: builtin/help.c:87
2930 +#: builtin/help.c:91
2931 msgid "Failed to start emacsclient."
2932 msgstr "Misslyckades starta emacsclient."
2933
2827 -#: builtin/help.c:100
2934 +#: builtin/help.c:104
2935 msgid "Failed to parse emacsclient version."
2936 msgstr "Kunde inte tolka emacsclient-version."
2937
2831 -#: builtin/help.c:108
2938 +#: builtin/help.c:112
2939 #, c-format
2940 msgid "emacsclient version '%d' too old (< 22)."
2941 msgstr "emacsclient version \"%d\" för gammal (< 22)."
2942
2836 -#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2943 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2944 #, c-format
2945 msgid "failed to exec '%s': %s"
2946 msgstr "exec misslyckades för \"%s\": %s"
2947
2841 -#: builtin/help.c:211
2948 +#: builtin/help.c:215
2949 #, c-format
2950 msgid ""
2951 "'%s': path for unsupported man viewer.\n"
@@ -2847,7 +2954,7 @@ msgstr ""
2954 "\"%s\": sökväg för man-visare som ej stöds.\n"
2955 "Använd \"man.<verktyg>.cmd\" istället."
2956
2850 -#: builtin/help.c:223
2957 +#: builtin/help.c:227
2958 #, c-format
2959 msgid ""
2960 "'%s': cmd for supported man viewer.\n"
@@ -2856,266 +2963,277 @@ msgstr ""
2963 "\"%s\": kommando för man-visare som stöds.\n"
2964 "Använd \"man.<verktyg>.path\" istället."
2965
2859 -#: builtin/help.c:287
2966 +#: builtin/help.c:291
2967 msgid "The most commonly used git commands are:"
2968 msgstr "De mest använda git-kommandona är:"
2969
2863 -#: builtin/help.c:355
2970 +#: builtin/help.c:359
2971 #, c-format
2972 msgid "'%s': unknown man viewer."
2973 msgstr "\"%s\": okänd man-visare."
2974
2868 -#: builtin/help.c:372
2975 +#: builtin/help.c:376
2976 msgid "no man viewer handled the request"
2977 msgstr "ingen man-visare hanterade förfrågan"
2978
2872 -#: builtin/help.c:380
2979 +#: builtin/help.c:384
2980 msgid "no info viewer handled the request"
2981 msgstr "ingen info-visare hanterade förfrågan"
2982
2876 -#: builtin/help.c:391
2983 +#: builtin/help.c:395
2984 #, c-format
2985 msgid "'%s': not a documentation directory."
2986 msgstr "\"%s\": inte en dokumentationskatalog."
2987
2881 -#: builtin/help.c:432 builtin/help.c:439
2988 +#: builtin/help.c:436 builtin/help.c:443
2989 #, c-format
2990 msgid "usage: %s%s"
2991 msgstr "användning: %s%s"
2992
2886 -#: builtin/help.c:453
2993 +#: builtin/help.c:459
2994 #, c-format
2995 msgid "`git %s' is aliased to `%s'"
2996 msgstr "\"git %s\" är ett alias för \"%s\""
2997
2891 -#: builtin/index-pack.c:169
2998 +#: builtin/index-pack.c:170
2999 #, c-format
3000 msgid "object type mismatch at %s"
3001 msgstr "objekttyp stämmer inte överens vid %s"
3002
2896 -#: builtin/index-pack.c:189
3003 +#: builtin/index-pack.c:190
3004 msgid "object of unexpected type"
3005 msgstr "objekt av oväntad typ"
3006
2900 -#: builtin/index-pack.c:226
3007 +#: builtin/index-pack.c:227
3008 #, c-format
3009 msgid "cannot fill %d byte"
3010 msgid_plural "cannot fill %d bytes"
3011 msgstr[0] "kan inte fylla %d byte"
3012 msgstr[1] "kan inte fylla %d byte"
3013
2907 -#: builtin/index-pack.c:236
3014 +#: builtin/index-pack.c:237
3015 msgid "early EOF"
3016 msgstr "tidigt filslut"
3017
2911 -#: builtin/index-pack.c:237
3018 +#: builtin/index-pack.c:238
3019 msgid "read error on input"
3020 msgstr "indataläsfel"
3021
2915 -#: builtin/index-pack.c:249
3022 +#: builtin/index-pack.c:250
3023 msgid "used more bytes than were available"
3024 msgstr "använde fler byte än tillgängligt"
3025
2919 -#: builtin/index-pack.c:256
3026 +#: builtin/index-pack.c:257
3027 msgid "pack too large for current definition of off_t"
3028 msgstr "paket för stort för nuvarande definition av off_t"
3029
2923 -#: builtin/index-pack.c:272
3030 +#: builtin/index-pack.c:273
3031 #, c-format
3032 msgid "unable to create '%s'"
3033 msgstr "kunde inte skapa \"%s\""
3034
2928 -#: builtin/index-pack.c:277
3035 +#: builtin/index-pack.c:278
3036 #, c-format
3037 msgid "cannot open packfile '%s'"
3038 msgstr "kan inte öppna paketfilen \"%s\""
3039
2933 -#: builtin/index-pack.c:291
3040 +#: builtin/index-pack.c:292
3041 msgid "pack signature mismatch"
3042 msgstr "paketsignatur stämmer inte överens"
3043
2937 -#: builtin/index-pack.c:311
3044 +#: builtin/index-pack.c:312
3045 #, c-format
3046 msgid "pack has bad object at offset %lu: %s"
3047 msgstr "paketet har felaktigt objekt vid index %lu: %s"
3048
2942 -#: builtin/index-pack.c:405
3049 +#: builtin/index-pack.c:434
3050 #, c-format
3051 msgid "inflate returned %d"
3052 msgstr "inflate returnerade %d"
3053
2947 -#: builtin/index-pack.c:450
3054 +#: builtin/index-pack.c:483
3055 msgid "offset value overflow for delta base object"
3056 msgstr "indexvärdespill för deltabasobjekt"
3057
2951 -#: builtin/index-pack.c:458
3058 +#: builtin/index-pack.c:491
3059 msgid "delta base offset is out of bound"
3060 msgstr "deltabasindex utanför gränsen"
3061
2955 -#: builtin/index-pack.c:466
3062 +#: builtin/index-pack.c:499
3063 #, c-format
3064 msgid "unknown object type %d"
3065 msgstr "okänd objekttyp %d"
3066
2960 -#: builtin/index-pack.c:495
3067 +#: builtin/index-pack.c:531
3068 msgid "cannot pread pack file"
3069 msgstr "kan inte utföra \"pread\" på paketfil"
3070
2964 -#: builtin/index-pack.c:497
3071 +#: builtin/index-pack.c:533
3072 #, c-format
3073 msgid "premature end of pack file, %lu byte missing"
3074 msgid_plural "premature end of pack file, %lu bytes missing"
3075 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"
3076 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"
3077
2971 -#: builtin/index-pack.c:510
3078 +#: builtin/index-pack.c:555
3079 msgid "serious inflate inconsistency"
3080 msgstr "allvarlig inflate-inkonsekvens"
3081
2975 -#: builtin/index-pack.c:583
2976 -#, c-format
2977 -msgid "cannot read existing object %s"
2978 -msgstr "kan inte läsa befintligt objekt %s"
2979 -
2980 -#: builtin/index-pack.c:586
3082 +#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
3083 +#: builtin/index-pack.c:709 builtin/index-pack.c:718
3084 #, c-format
3085 msgid "SHA1 COLLISION FOUND WITH %s !"
3086 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
3087
2985 -#: builtin/index-pack.c:598
3088 +#: builtin/index-pack.c:649 builtin/pack-objects.c:170
3089 +#: builtin/pack-objects.c:262
3090 +#, c-format
3091 +msgid "unable to read %s"
3092 +msgstr "kunde inte läsa %s"
3093 +
3094 +#: builtin/index-pack.c:715
3095 +#, c-format
3096 +msgid "cannot read existing object %s"
3097 +msgstr "kan inte läsa befintligt objekt %s"
3098 +
3099 +#: builtin/index-pack.c:729
3100 #, c-format
3101 msgid "invalid blob object %s"
3102 msgstr "ogiltigt blob-objekt %s"
3103
2990 -#: builtin/index-pack.c:610
3104 +#: builtin/index-pack.c:744
3105 #, c-format
3106 msgid "invalid %s"
3107 msgstr "ogiltigt %s"
3108
2995 -#: builtin/index-pack.c:612
3109 +#: builtin/index-pack.c:746
3110 msgid "Error in object"
3111 msgstr "Fel i objekt"
3112
2999 -#: builtin/index-pack.c:614
3113 +#: builtin/index-pack.c:748
3114 #, c-format
3115 msgid "Not all child objects of %s are reachable"
3116 msgstr "Inte alla barnobjekt för %s kan nås"
3117
3004 -#: builtin/index-pack.c:687 builtin/index-pack.c:713
3118 +#: builtin/index-pack.c:818 builtin/index-pack.c:844
3119 msgid "failed to apply delta"
3120 msgstr "misslyckades tillämpa delta"
3121
3008 -#: builtin/index-pack.c:850
3122 +#: builtin/index-pack.c:983
3123 msgid "Receiving objects"
3124 msgstr "Tar bort objeckt"
3125
3012 -#: builtin/index-pack.c:850
3126 +#: builtin/index-pack.c:983
3127 msgid "Indexing objects"
3128 msgstr "Skapar index för objekt"
3129
3016 -#: builtin/index-pack.c:872
3130 +#: builtin/index-pack.c:1009
3131 msgid "pack is corrupted (SHA1 mismatch)"
3132 msgstr "paketet är trasigt (SHA1 stämmer inte)"
3133
3020 -#: builtin/index-pack.c:877
3134 +#: builtin/index-pack.c:1014
3135 msgid "cannot fstat packfile"
3136 msgstr "kan inte utföra \"fstat\" på paketfil"
3137
3024 -#: builtin/index-pack.c:880
3138 +#: builtin/index-pack.c:1017
3139 msgid "pack has junk at the end"
3140 msgstr "paket har skräp i slutet"
3141
3028 -#: builtin/index-pack.c:903
3142 +#: builtin/index-pack.c:1028
3143 +msgid "confusion beyond insanity in parse_pack_objects()"
3144 +msgstr "förvirrad bortom vanvett i parse_pack_objects()"
3145 +
3146 +#: builtin/index-pack.c:1051
3147 msgid "Resolving deltas"
3148 msgstr "Analyserar delta"
3149
3032 -#: builtin/index-pack.c:954
3150 +#: builtin/index-pack.c:1102
3151 msgid "confusion beyond insanity"
3152 msgstr "förvirrad bortom vanvett"
3153
3036 -#: builtin/index-pack.c:973
3154 +#: builtin/index-pack.c:1121
3155 #, c-format
3156 msgid "pack has %d unresolved delta"
3157 msgid_plural "pack has %d unresolved deltas"
3158 msgstr[0] "paketet har %d oanalyserat delta"
3159 msgstr[1] "paketet har %d oanalyserade delta"
3160
3043 -#: builtin/index-pack.c:998
3161 +#: builtin/index-pack.c:1146
3162 #, c-format
3163 msgid "unable to deflate appended object (%d)"
3164 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
3165
3048 -#: builtin/index-pack.c:1077
3166 +#: builtin/index-pack.c:1225
3167 #, c-format
3168 msgid "local object %s is corrupt"
3169 msgstr "lokalt objekt %s är trasigt"
3170
3053 -#: builtin/index-pack.c:1101
3171 +#: builtin/index-pack.c:1249
3172 msgid "error while closing pack file"
3173 msgstr "fel vid stängning av paketfil"
3174
3057 -#: builtin/index-pack.c:1114
3175 +#: builtin/index-pack.c:1262
3176 #, c-format
3177 msgid "cannot write keep file '%s'"
3178 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
3179
3062 -#: builtin/index-pack.c:1122
3180 +#: builtin/index-pack.c:1270
3181 #, c-format
3182 msgid "cannot close written keep file '%s'"
3183 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
3184
3067 -#: builtin/index-pack.c:1135
3185 +#: builtin/index-pack.c:1283
3186 msgid "cannot store pack file"
3187 msgstr "kan inte spara paketfil"
3188
3071 -#: builtin/index-pack.c:1146
3189 +#: builtin/index-pack.c:1294
3190 msgid "cannot store index file"
3191 msgstr "kan inte spara indexfil"
3192
3075 -#: builtin/index-pack.c:1247
3193 +#: builtin/index-pack.c:1395
3194 #, c-format
3195 msgid "Cannot open existing pack file '%s'"
3196 msgstr "Kan inte öppna befintlig paketfil \"%s\""
3197
3080 -#: builtin/index-pack.c:1249
3198 +#: builtin/index-pack.c:1397
3199 #, c-format
3200 msgid "Cannot open existing pack idx file for '%s'"
3201 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""
3202
3085 -#: builtin/index-pack.c:1296
3203 +#: builtin/index-pack.c:1444
3204 #, c-format
3205 msgid "non delta: %d object"
3206 msgid_plural "non delta: %d objects"
3207 msgstr[0] "icke-delta: %d objekt"
3208 msgstr[1] "icke-delta: %d objekt"
3209
3092 -#: builtin/index-pack.c:1303
3210 +#: builtin/index-pack.c:1451
3211 #, c-format
3212 msgid "chain length = %d: %lu object"
3213 msgid_plural "chain length = %d: %lu objects"
3214 msgstr[0] "kedjelängd = %d: %lu objekt"
3215 msgstr[1] "kedjelängd = %d: %lu objekt"
3216
3099 -#: builtin/index-pack.c:1330
3217 +#: builtin/index-pack.c:1478
3218 msgid "Cannot come back to cwd"
3219 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
3220
3103 -#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3104 -#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3221 +#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3222 +#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3223 #, c-format
3224 msgid "bad %s"
3225 msgstr "felaktig %s"
3226
3109 -#: builtin/index-pack.c:1407
3227 +#: builtin/index-pack.c:1555
3228 msgid "--fix-thin cannot be used without --stdin"
3229 msgstr "--fix-thin kan inte användas med --stdin"
3230
3113 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3231 +#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3232 #, c-format
3233 msgid "packfile name '%s' does not end with '.pack'"
3234 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
3235
3118 -#: builtin/index-pack.c:1430
3236 +#: builtin/index-pack.c:1578
3237 msgid "--verify with no packfile name given"
3238 msgstr "--verify angavs utan paketfilnamn"
3239
@@ -3263,100 +3381,100 @@ msgstr "Kan inte komma åt aktuell arbetskatalog"
3381 msgid "Cannot access work tree '%s'"
3382 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
3383
3266 -#: builtin/log.c:188
3384 +#: builtin/log.c:189
3385 #, c-format
3386 msgid "Final output: %d %s\n"
3387 msgstr "Slututdata: %d %s\n"
3388
3271 -#: builtin/log.c:401 builtin/log.c:489
3389 +#: builtin/log.c:402 builtin/log.c:490
3390 #, c-format
3391 msgid "Could not read object %s"
3392 msgstr "Kunde inte läsa objektet %s"
3393
3276 -#: builtin/log.c:513
3394 +#: builtin/log.c:514
3395 #, c-format
3396 msgid "Unknown type: %d"
3397 msgstr "Okänd typ: %d"
3398
3281 -#: builtin/log.c:602
3399 +#: builtin/log.c:603
3400 msgid "format.headers without value"
3401 msgstr "format.headers utan värde"
3402
3285 -#: builtin/log.c:676
3403 +#: builtin/log.c:677
3404 msgid "name of output directory is too long"
3405 msgstr "namnet på utdatakatalogen är för långt"
3406
3289 -#: builtin/log.c:687
3407 +#: builtin/log.c:688
3408 #, c-format
3409 msgid "Cannot open patch file %s"
3410 msgstr "Kan inte öppna patchfilen %s"
3411
3294 -#: builtin/log.c:701
3412 +#: builtin/log.c:702
3413 msgid "Need exactly one range."
3414 msgstr "Behöver precis ett intervall."
3415
3298 -#: builtin/log.c:709
3416 +#: builtin/log.c:710
3417 msgid "Not a range."
3418 msgstr "Inte ett intervall."
3419
3302 -#: builtin/log.c:786
3420 +#: builtin/log.c:787
3421 msgid "Cover letter needs email format"
3422 msgstr "Omslagsbrevet behöver e-postformat"
3423
3306 -#: builtin/log.c:859
3424 +#: builtin/log.c:860
3425 #, c-format
3426 msgid "insane in-reply-to: %s"
3427 msgstr "tokigt in-reply-to: %s"
3428
3311 -#: builtin/log.c:932
3429 +#: builtin/log.c:933
3430 msgid "Two output directories?"
3431 msgstr "Två utdatakataloger?"
3432
3315 -#: builtin/log.c:1153
3433 +#: builtin/log.c:1154
3434 #, c-format
3435 msgid "bogus committer info %s"
3436 msgstr "felaktig incheckarinformation %s"
3437
3320 -#: builtin/log.c:1198
3438 +#: builtin/log.c:1199
3439 msgid "-n and -k are mutually exclusive."
3440 msgstr "-n och -k kan inte användas samtidigt."
3441
3324 -#: builtin/log.c:1200
3442 +#: builtin/log.c:1201
3443 msgid "--subject-prefix and -k are mutually exclusive."
3444 msgstr "--subject-prefix och -k kan inte användas samtidigt."
3445
3328 -#: builtin/log.c:1208
3446 +#: builtin/log.c:1209
3447 msgid "--name-only does not make sense"
3448 msgstr "kan inte använda --name-only"
3449
3332 -#: builtin/log.c:1210
3450 +#: builtin/log.c:1211
3451 msgid "--name-status does not make sense"
3452 msgstr "kan inte använda --name-status"
3453
3336 -#: builtin/log.c:1212
3454 +#: builtin/log.c:1213
3455 msgid "--check does not make sense"
3456 msgstr "kan inte använda --check"
3457
3340 -#: builtin/log.c:1235
3458 +#: builtin/log.c:1236
3459 msgid "standard output, or directory, which one?"
3460 msgstr "standard ut, eller katalog, vilken skall det vara?"
3461
3344 -#: builtin/log.c:1237
3462 +#: builtin/log.c:1238
3463 #, c-format
3464 msgid "Could not create directory '%s'"
3465 msgstr "Kunde inte skapa katalogen \"%s\""
3466
3349 -#: builtin/log.c:1390
3467 +#: builtin/log.c:1391
3468 msgid "Failed to create output files"
3469 msgstr "Misslyckades skapa utdatafiler"
3470
3353 -#: builtin/log.c:1494
3471 +#: builtin/log.c:1495
3472 #, c-format
3473 msgid ""
3474 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3475 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
3476
3359 -#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3477 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3478 #, c-format
3479 msgid "Unknown commit %s"
3480 msgstr "Okänd incheckning %s"
@@ -3846,22 +3964,27 @@ msgstr "Objektet %s har ingen anteckning\n"
3964 msgid "Unknown subcommand: %s"
3965 msgstr "Okänt underkommando: %s"
3966
3849 -#: builtin/pack-objects.c:2337
3967 +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
3968 +#, c-format
3969 +msgid "deflate error (%d)"
3970 +msgstr "fel i deflate (%d)"
3971 +
3972 +#: builtin/pack-objects.c:2398
3973 #, c-format
3974 msgid "unsupported index version %s"
3975 msgstr "indexversionen %s stöds ej"
3976
3854 -#: builtin/pack-objects.c:2341
3977 +#: builtin/pack-objects.c:2402
3978 #, c-format
3979 msgid "bad index version '%s'"
3980 msgstr "felaktig indexversion \"%s\""
3981
3859 -#: builtin/pack-objects.c:2364
3982 +#: builtin/pack-objects.c:2425
3983 #, c-format
3984 msgid "option %s does not accept negative form"
3985 msgstr "flaggan %s godtar inte negativ form"
3986
3864 -#: builtin/pack-objects.c:2368
3987 +#: builtin/pack-objects.c:2429
3988 #, c-format
3989 msgid "unable to parse value '%s' for option %s"
3990 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
@@ -5291,38 +5414,38 @@ msgstr "Inget grennamn angavs"
5414 msgid "(To restore them type \"git stash apply\")"
5415 msgstr "(För att återställa dem, skriv \"git stash apply\")"
5416
5294 -#: git-submodule.sh:56
5417 +#: git-submodule.sh:88
5418 #, sh-format
5419 msgid "cannot strip one component off url '$remoteurl'"
5420 msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
5421
5299 -#: git-submodule.sh:109
5422 +#: git-submodule.sh:145
5423 #, sh-format
5424 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5425 msgstr ""
5426 "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
5427
5305 -#: git-submodule.sh:150
5428 +#: git-submodule.sh:186
5429 #, sh-format
5430 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5431 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
5432
5310 -#: git-submodule.sh:160
5433 +#: git-submodule.sh:196
5434 #, sh-format
5435 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5436 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"
5437
5315 -#: git-submodule.sh:249
5438 +#: git-submodule.sh:285
5439 #, sh-format
5440 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5441 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
5442
5320 -#: git-submodule.sh:266
5443 +#: git-submodule.sh:302
5444 #, sh-format
5445 msgid "'$sm_path' already exists in the index"
5446 msgstr "\"$sm_path\" finns redan i indexet"
5447
5325 -#: git-submodule.sh:270
5448 +#: git-submodule.sh:306
5449 #, sh-format
5450 msgid ""
5451 "The following path is ignored by one of your .gitignore files:\n"
@@ -5333,64 +5456,64 @@ msgstr ""
5456 "$sm_path\n"
5457 "Använd -f om du verkligen vill lägga till den"
5458
5336 -#: git-submodule.sh:281
5459 +#: git-submodule.sh:317
5460 #, sh-format
5461 msgid "Adding existing repo at '$sm_path' to the index"
5462 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
5463
5341 -#: git-submodule.sh:283
5464 +#: git-submodule.sh:319
5465 #, sh-format
5466 msgid "'$sm_path' already exists and is not a valid git repo"
5467 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
5468
5346 -#: git-submodule.sh:297
5469 +#: git-submodule.sh:333
5470 #, sh-format
5471 msgid "Unable to checkout submodule '$sm_path'"
5472 msgstr "Kan inte checka ut undermodulen \"$sm_path\""
5473
5351 -#: git-submodule.sh:302
5474 +#: git-submodule.sh:338
5475 #, sh-format
5476 msgid "Failed to add submodule '$sm_path'"
5477 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
5478
5356 -#: git-submodule.sh:307
5479 +#: git-submodule.sh:343
5480 #, sh-format
5481 msgid "Failed to register submodule '$sm_path'"
5482 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
5483
5361 -#: git-submodule.sh:349
5484 +#: git-submodule.sh:385
5485 #, sh-format
5486 msgid "Entering '$prefix$sm_path'"
5487 msgstr "Går in i \"$prefix$sm_path\""
5488
5366 -#: git-submodule.sh:363
5489 +#: git-submodule.sh:399
5490 #, sh-format
5491 msgid "Stopping at '$sm_path'; script returned non-zero status."
5492 msgstr ""
5493 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."
5494
5372 -#: git-submodule.sh:406
5495 +#: git-submodule.sh:442
5496 #, sh-format
5497 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5498 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"
5499
5377 -#: git-submodule.sh:415
5500 +#: git-submodule.sh:451
5501 #, sh-format
5502 msgid "Failed to register url for submodule path '$sm_path'"
5503 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""
5504
5382 -#: git-submodule.sh:417
5505 +#: git-submodule.sh:453
5506 #, sh-format
5507 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5508 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""
5509
5387 -#: git-submodule.sh:425
5510 +#: git-submodule.sh:461
5511 #, sh-format
5512 msgid "Failed to register update mode for submodule path '$sm_path'"
5513 msgstr ""
5514 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""
5515
5393 -#: git-submodule.sh:524
5516 +#: git-submodule.sh:560
5517 #, sh-format
5518 msgid ""
5519 "Submodule path '$sm_path' not initialized\n"
@@ -5399,93 +5522,93 @@ msgstr ""
5522 "Undermodulen \"$sm_path\" har inte initierats\n"
5523 "Kanske du vill köra \"update --init\"?"
5524
5402 -#: git-submodule.sh:537
5525 +#: git-submodule.sh:573
5526 #, sh-format
5527 msgid "Unable to find current revision in submodule path '$sm_path'"
5528 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""
5529
5407 -#: git-submodule.sh:556
5530 +#: git-submodule.sh:592
5531 #, sh-format
5532 msgid "Unable to fetch in submodule path '$sm_path'"
5533 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
5534
5412 -#: git-submodule.sh:570
5535 +#: git-submodule.sh:606
5536 #, sh-format
5537 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5538 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""
5539
5417 -#: git-submodule.sh:571
5540 +#: git-submodule.sh:607
5541 #, sh-format
5542 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5543 msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""
5544
5422 -#: git-submodule.sh:576
5545 +#: git-submodule.sh:612
5546 #, sh-format
5547 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5548 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""
5549
5427 -#: git-submodule.sh:577
5550 +#: git-submodule.sh:613
5551 #, sh-format
5552 msgid "Submodule path '$sm_path': merged in '$sha1'"
5553 msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""
5554
5432 -#: git-submodule.sh:582
5555 +#: git-submodule.sh:618
5556 #, sh-format
5557 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5558 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""
5559
5437 -#: git-submodule.sh:583
5560 +#: git-submodule.sh:619
5561 #, sh-format
5562 msgid "Submodule path '$sm_path': checked out '$sha1'"
5563 msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""
5564
5442 -#: git-submodule.sh:605 git-submodule.sh:928
5565 +#: git-submodule.sh:641 git-submodule.sh:964
5566 #, sh-format
5567 msgid "Failed to recurse into submodule path '$sm_path'"
5568 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
5569
5447 -#: git-submodule.sh:713
5570 +#: git-submodule.sh:749
5571 msgid "--cached cannot be used with --files"
5572 msgstr "--cached kan inte användas med --files"
5573
5574 #. unexpected type
5452 -#: git-submodule.sh:753
5575 +#: git-submodule.sh:789
5576 #, sh-format
5577 msgid "unexpected mode $mod_dst"
5578 msgstr "oväntat läge $mod_dst"
5579
5457 -#: git-submodule.sh:771
5580 +#: git-submodule.sh:807
5581 #, sh-format
5582 msgid " Warn: $name doesn't contain commit $sha1_src"
5583 msgstr " Varning: $name innehåller inte incheckning $sha1_src"
5584
5462 -#: git-submodule.sh:774
5585 +#: git-submodule.sh:810
5586 #, sh-format
5587 msgid " Warn: $name doesn't contain commit $sha1_dst"
5588 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"
5589
5467 -#: git-submodule.sh:777
5590 +#: git-submodule.sh:813
5591 #, sh-format
5592 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5593 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"
5594
5472 -#: git-submodule.sh:802
5595 +#: git-submodule.sh:838
5596 msgid "blob"
5597 msgstr "blob"
5598
5476 -#: git-submodule.sh:803
5599 +#: git-submodule.sh:839
5600 msgid "submodule"
5601 msgstr "undermodul"
5602
5480 -#: git-submodule.sh:840
5603 +#: git-submodule.sh:876
5604 msgid "# Submodules changed but not updated:"
5605 msgstr "# Undermoduler ändrade men inte uppdaterade:"
5606
5484 -#: git-submodule.sh:842
5607 +#: git-submodule.sh:878
5608 msgid "# Submodule changes to be committed:"
5609 msgstr "# Undermodulers ändringar att checka in:"
5610
5488 -#: git-submodule.sh:974
5611 +#: git-submodule.sh:1022
5612 #, sh-format
5613 msgid "Synchronizing submodule url for '$name'"
5614 msgstr "Synkroniserar undermodul-url för \"$name\""