l10n: sv.po: Update Swedish translation (5282t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Peter Krefting committed
Apr 17, 2022 at 18:13 UTC
9b23d2c7b8970e76125872ccf0aed2e9484c250c
1 file changed
+4746
-3970
po/sv.po
+4746
-3970
@@ -5,10 +5,10 @@
5
#
6
msgid ""
7
msgstr ""
8
-"Project-Id-Version: git 2.34.0\n"
8
+"Project-Id-Version: git 2.36.0\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2022-01-17 08:34+0800\n"
11
-"PO-Revision-Date: 2022-01-11 16:34+0100\n"
10
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
11
+"PO-Revision-Date: 2022-04-17 18:08+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"
@@ -16,215 +16,213 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
-"X-Generator: Gtranslator 3.38.0\n"
19
21
-#: add-interactive.c:380
20
+#: add-interactive.c:382
21
#, c-format
22
msgid "Huh (%s)?"
23
msgstr "Vadå (%s)?"
24
26
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
27
-#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
28
-#: builtin/rebase.c:1642
25
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
26
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
27
+#: builtin/rebase.c:1671
28
msgid "could not read index"
29
msgstr "kunde inte läsa indexet"
30
32
-#: add-interactive.c:588 git-add--interactive.perl:269
31
+#: add-interactive.c:590 git-add--interactive.perl:269
32
#: git-add--interactive.perl:294
33
msgid "binary"
34
msgstr "binär"
35
37
-#: add-interactive.c:646 git-add--interactive.perl:278
36
+#: add-interactive.c:648 git-add--interactive.perl:278
37
#: git-add--interactive.perl:332
38
msgid "nothing"
39
msgstr "ingenting"
40
42
-#: add-interactive.c:647 git-add--interactive.perl:314
41
+#: add-interactive.c:649 git-add--interactive.perl:314
42
#: git-add--interactive.perl:329
43
msgid "unchanged"
44
msgstr "oändrad"
45
47
-#: add-interactive.c:684 git-add--interactive.perl:641
46
+#: add-interactive.c:686 git-add--interactive.perl:641
47
msgid "Update"
48
msgstr "Uppdatera"
49
51
-#: add-interactive.c:701 add-interactive.c:889
50
+#: add-interactive.c:703 add-interactive.c:891
51
#, c-format
52
msgid "could not stage '%s'"
53
msgstr "kunde inte köa \"%s\""
54
56
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
55
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
56
msgid "could not write index"
57
msgstr "kunde inte skriva indexet"
58
60
-#: add-interactive.c:710 git-add--interactive.perl:626
59
+#: add-interactive.c:712 git-add--interactive.perl:626
60
#, c-format, perl-format
61
msgid "updated %d path\n"
62
msgid_plural "updated %d paths\n"
63
msgstr[0] "uppdaterade %d sökväg\n"
64
msgstr[1] "uppdaterade %d sökvägar\n"
65
67
-#: add-interactive.c:728 git-add--interactive.perl:676
66
+#: add-interactive.c:730 git-add--interactive.perl:676
67
#, c-format, perl-format
68
msgid "note: %s is untracked now.\n"
69
msgstr "observera: %s spåras inte längre.\n"
70
72
-#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
71
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
72
#: builtin/reset.c:167
73
#, c-format
74
msgid "make_cache_entry failed for path '%s'"
75
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
76
78
-#: add-interactive.c:763 git-add--interactive.perl:653
77
+#: add-interactive.c:765 git-add--interactive.perl:653
78
msgid "Revert"
79
msgstr "Återställ"
80
82
-#: add-interactive.c:779
81
+#: add-interactive.c:781
82
msgid "Could not parse HEAD^{tree}"
83
msgstr "kunde inte tolka HEAD^{tree}"
84
86
-#: add-interactive.c:817 git-add--interactive.perl:629
85
+#: add-interactive.c:819 git-add--interactive.perl:629
86
#, c-format, perl-format
87
msgid "reverted %d path\n"
88
msgid_plural "reverted %d paths\n"
89
msgstr[0] "återställde %d sökväg\n"
90
msgstr[1] "återställde %d sökvägar\n"
91
93
-#: add-interactive.c:868 git-add--interactive.perl:693
92
+#: add-interactive.c:870 git-add--interactive.perl:693
93
#, c-format
94
msgid "No untracked files.\n"
95
msgstr "Inga ospårade filer.\n"
96
98
-#: add-interactive.c:872 git-add--interactive.perl:687
97
+#: add-interactive.c:874 git-add--interactive.perl:687
98
msgid "Add untracked"
99
msgstr "Lägg till ospårad"
100
102
-#: add-interactive.c:899 git-add--interactive.perl:623
101
+#: add-interactive.c:901 git-add--interactive.perl:623
102
#, c-format, perl-format
103
msgid "added %d path\n"
104
msgid_plural "added %d paths\n"
105
msgstr[0] "lade till %d sökväg\n"
106
msgstr[1] "lade till %d sökvägar\n"
107
109
-#: add-interactive.c:929
108
+#: add-interactive.c:931
109
#, c-format
110
msgid "ignoring unmerged: %s"
111
msgstr "ignorerar ej sammanslagen: %s"
112
114
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
113
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
114
#, c-format
115
msgid "Only binary files changed.\n"
116
msgstr "Endast binära filer ändrade.\n"
117
119
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
118
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
119
#, c-format
120
msgid "No changes.\n"
121
msgstr "Inga ändringar.\n"
122
124
-#: add-interactive.c:947 git-add--interactive.perl:1381
123
+#: add-interactive.c:949 git-add--interactive.perl:1381
124
msgid "Patch update"
125
msgstr "Uppdatera patch"
126
128
-#: add-interactive.c:986 git-add--interactive.perl:1794
127
+#: add-interactive.c:988 git-add--interactive.perl:1794
128
msgid "Review diff"
129
msgstr "Granska diff"
130
132
-#: add-interactive.c:1014
131
+#: add-interactive.c:1016
132
msgid "show paths with changes"
133
msgstr "visa sökvägar med ändringar"
134
136
-#: add-interactive.c:1016
135
+#: add-interactive.c:1018
136
msgid "add working tree state to the staged set of changes"
137
msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
138
140
-#: add-interactive.c:1018
139
+#: add-interactive.c:1020
140
msgid "revert staged set of changes back to the HEAD version"
141
msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
142
144
-#: add-interactive.c:1020
143
+#: add-interactive.c:1022
144
msgid "pick hunks and update selectively"
145
msgstr "välj stycken och uppdatera selektivt"
146
148
-#: add-interactive.c:1022
147
+#: add-interactive.c:1024
148
msgid "view diff between HEAD and index"
149
msgstr "visa skillnad mellan HEAD och index"
150
152
-#: add-interactive.c:1024
151
+#: add-interactive.c:1026
152
msgid "add contents of untracked files to the staged set of changes"
153
msgstr "lägg innehåll i ospårade filer till köade ändringar"
154
156
-#: add-interactive.c:1032 add-interactive.c:1081
155
+#: add-interactive.c:1034 add-interactive.c:1083
156
msgid "Prompt help:"
157
msgstr "Kommandoradshjälp:"
158
160
-#: add-interactive.c:1034
159
+#: add-interactive.c:1036
160
msgid "select a single item"
161
msgstr "markera en post"
162
164
-#: add-interactive.c:1036
163
+#: add-interactive.c:1038
164
msgid "select a range of items"
165
msgstr "markera intervall av poster"
166
168
-#: add-interactive.c:1038
167
+#: add-interactive.c:1040
168
msgid "select multiple ranges"
169
msgstr "markera flera intervall"
170
172
-#: add-interactive.c:1040 add-interactive.c:1085
171
+#: add-interactive.c:1042 add-interactive.c:1087
172
msgid "select item based on unique prefix"
173
msgstr "markera post baserad på unikt prefix"
174
176
-#: add-interactive.c:1042
175
+#: add-interactive.c:1044
176
msgid "unselect specified items"
177
msgstr "avmarkera angivna poster"
178
180
-#: add-interactive.c:1044
179
+#: add-interactive.c:1046
180
msgid "choose all items"
181
msgstr "välj alla poster"
182
184
-#: add-interactive.c:1046
183
+#: add-interactive.c:1048
184
msgid "(empty) finish selecting"
185
msgstr "(tomt) avsluta markering"
186
188
-#: add-interactive.c:1083
187
+#: add-interactive.c:1085
188
msgid "select a numbered item"
189
msgstr "markera en numrerad post"
190
192
-#: add-interactive.c:1087
191
+#: add-interactive.c:1089
192
msgid "(empty) select nothing"
193
msgstr "(tomt) markera ingenting"
194
196
-#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
195
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
196
msgid "*** Commands ***"
197
msgstr "*** Kommandon ***"
198
200
-#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
199
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
200
msgid "What now"
201
msgstr "Vad nu"
202
204
-#: add-interactive.c:1148 git-add--interactive.perl:213
203
+#: add-interactive.c:1150 git-add--interactive.perl:213
204
msgid "staged"
205
msgstr "köad"
206
208
-#: add-interactive.c:1148 git-add--interactive.perl:213
207
+#: add-interactive.c:1150 git-add--interactive.perl:213
208
msgid "unstaged"
209
msgstr "ej köad"
210
212
-#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
213
-#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
214
-#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
215
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
216
-#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
217
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
218
-#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
211
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
212
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
213
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
214
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
215
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
216
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
217
#: git-add--interactive.perl:213
218
msgid "path"
219
msgstr "sökväg"
220
223
-#: add-interactive.c:1155
221
+#: add-interactive.c:1157
222
msgid "could not refresh index"
223
msgstr "kunde inte uppdatera indexet"
224
227
-#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
225
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
226
#, c-format
227
msgid "Bye.\n"
228
msgstr "Hej då.\n"
@@ -535,24 +533,24 @@ msgstr "kunde inte tolka styckehuvudet \"%.*s\""
533
msgid "could not parse colored hunk header '%.*s'"
534
msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
535
538
-#: add-patch.c:420
536
+#: add-patch.c:431
537
msgid "could not parse diff"
538
msgstr "kunde inte tolka diff"
539
542
-#: add-patch.c:439
540
+#: add-patch.c:450
541
msgid "could not parse colored diff"
542
msgstr "kunde inte tolka färgad diff"
543
546
-#: add-patch.c:453
544
+#: add-patch.c:464
545
#, c-format
546
msgid "failed to run '%s'"
547
msgstr "misslyckades att köra \"%s\""
548
551
-#: add-patch.c:612
549
+#: add-patch.c:618
550
msgid "mismatched output from interactive.diffFilter"
551
msgstr "omaka utdata från interactive.diffFilter"
552
555
-#: add-patch.c:613
553
+#: add-patch.c:619
554
msgid ""
555
"Your filter must maintain a one-to-one correspondence\n"
556
"between its input and output lines."
@@ -560,7 +558,7 @@ msgstr ""
558
"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
559
"ditt filter."
560
563
-#: add-patch.c:791
561
+#: add-patch.c:797
562
#, c-format
563
msgid ""
564
"expected context line #%d in\n"
@@ -569,7 +567,7 @@ msgstr ""
567
"förväntade sammanhangsrad %d i\n"
568
"%.*s"
569
572
-#: add-patch.c:806
570
+#: add-patch.c:812
571
#, c-format
572
msgid ""
573
"hunks do not overlap:\n"
@@ -582,11 +580,11 @@ msgstr ""
580
"\tavslutas inte med:\n"
581
"%.*s"
582
585
-#: add-patch.c:1082 git-add--interactive.perl:1115
583
+#: add-patch.c:1088 git-add--interactive.perl:1115
584
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
585
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
586
589
-#: add-patch.c:1086
587
+#: add-patch.c:1092
588
#, c-format
589
msgid ""
590
"---\n"
@@ -600,7 +598,7 @@ msgstr ""
598
"Rader som börjar med %c kommer att tas bort.\n"
599
600
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
603
-#: add-patch.c:1100 git-add--interactive.perl:1129
601
+#: add-patch.c:1106 git-add--interactive.perl:1129
602
msgid ""
603
"If it does not apply cleanly, you will be given an opportunity to\n"
604
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -610,11 +608,11 @@ msgstr ""
608
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
609
"redigeringen och stycket lämnas oförändrat.\n"
610
613
-#: add-patch.c:1133
611
+#: add-patch.c:1139
612
msgid "could not parse hunk header"
613
msgstr "kunde inte tolka styckehuvud"
614
617
-#: add-patch.c:1178
615
+#: add-patch.c:1184
616
msgid "'git apply --cached' failed"
617
msgstr "\"git apply --cached\" misslyckades"
618
@@ -630,26 +628,26 @@ msgstr "\"git apply --cached\" misslyckades"
628
#. Consider translating (saying "no" discards!) as
629
#. (saying "n" for "no" discards!) if the translation
630
#. of the word "no" does not start with n.
633
-#: add-patch.c:1247 git-add--interactive.perl:1244
631
+#: add-patch.c:1253 git-add--interactive.perl:1244
632
msgid ""
633
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
634
msgstr ""
635
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
636
"[y/n]? "
637
640
-#: add-patch.c:1290
638
+#: add-patch.c:1296
639
msgid "The selected hunks do not apply to the index!"
640
msgstr "Markerade stycken kan inte appliceras på indexet!"
641
644
-#: add-patch.c:1291 git-add--interactive.perl:1348
642
+#: add-patch.c:1297 git-add--interactive.perl:1348
643
msgid "Apply them to the worktree anyway? "
644
msgstr "Applicera dem på arbetskatalogen trots det? "
645
648
-#: add-patch.c:1298 git-add--interactive.perl:1351
646
+#: add-patch.c:1304 git-add--interactive.perl:1351
647
msgid "Nothing was applied.\n"
648
msgstr "Ingenting applicerades.\n"
649
652
-#: add-patch.c:1355
650
+#: add-patch.c:1361
651
msgid ""
652
"j - leave this hunk undecided, see next undecided hunk\n"
653
"J - leave this hunk undecided, see next hunk\n"
@@ -671,73 +669,73 @@ msgstr ""
669
"e - redigera aktuellt stycke manuellt\n"
670
"? - visa hjälp\n"
671
674
-#: add-patch.c:1517 add-patch.c:1527
672
+#: add-patch.c:1523 add-patch.c:1533
673
msgid "No previous hunk"
674
msgstr "Inget föregående stycke"
675
678
-#: add-patch.c:1522 add-patch.c:1532
676
+#: add-patch.c:1528 add-patch.c:1538
677
msgid "No next hunk"
678
msgstr "Inget följande stycke"
679
682
-#: add-patch.c:1538
680
+#: add-patch.c:1544
681
msgid "No other hunks to goto"
682
msgstr "Inga andra stycken att gå till"
683
686
-#: add-patch.c:1549 git-add--interactive.perl:1608
684
+#: add-patch.c:1555 git-add--interactive.perl:1608
685
msgid "go to which hunk (<ret> to see more)? "
686
msgstr "gå till vilket stycke (<ret> för att se fler)? "
687
690
-#: add-patch.c:1550 git-add--interactive.perl:1610
688
+#: add-patch.c:1556 git-add--interactive.perl:1610
689
msgid "go to which hunk? "
690
msgstr "gå till vilket stycke? "
691
694
-#: add-patch.c:1561
692
+#: add-patch.c:1567
693
#, c-format
694
msgid "Invalid number: '%s'"
695
msgstr "Ogiltigt siffervärde: \"%s\""
696
699
-#: add-patch.c:1566
697
+#: add-patch.c:1572
698
#, c-format
699
msgid "Sorry, only %d hunk available."
700
msgid_plural "Sorry, only %d hunks available."
701
msgstr[0] "Beklagar, det finns bara %d stycke."
702
msgstr[1] "Beklagar, det finns bara %d stycken."
703
706
-#: add-patch.c:1575
704
+#: add-patch.c:1581
705
msgid "No other hunks to search"
706
msgstr "Inga andra stycken att söka efter"
707
710
-#: add-patch.c:1581 git-add--interactive.perl:1663
708
+#: add-patch.c:1587 git-add--interactive.perl:1663
709
msgid "search for regex? "
710
msgstr "sök efter reguljärt uttryck? "
711
714
-#: add-patch.c:1596
712
+#: add-patch.c:1602
713
#, c-format
714
msgid "Malformed search regexp %s: %s"
715
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
716
719
-#: add-patch.c:1613
717
+#: add-patch.c:1619
718
msgid "No hunk matches the given pattern"
719
msgstr "Inga stycken motsvarar givet mönster"
720
723
-#: add-patch.c:1620
721
+#: add-patch.c:1626
722
msgid "Sorry, cannot split this hunk"
723
msgstr "Beklagar, kan inte dela stycket"
724
727
-#: add-patch.c:1624
725
+#: add-patch.c:1630
726
#, c-format
727
msgid "Split into %d hunks."
728
msgstr "Dela i %d stycken."
729
732
-#: add-patch.c:1628
730
+#: add-patch.c:1634
731
msgid "Sorry, cannot edit this hunk"
732
msgstr "Beklagar, kan inte redigera stycket"
733
736
-#: add-patch.c:1680
734
+#: add-patch.c:1686
735
msgid "'git apply' failed"
736
msgstr "\"git apply\" misslyckades"
737
740
-#: advice.c:78
738
+#: advice.c:81
739
#, c-format
740
msgid ""
741
"\n"
@@ -746,47 +744,47 @@ msgstr ""
744
"\n"
745
"Slå av meddelandet med \"git config advice.%s false\""
746
749
-#: advice.c:94
747
+#: advice.c:97
748
#, c-format
749
msgid "%shint: %.*s%s\n"
750
msgstr "%stips: %.*s%s\n"
751
754
-#: advice.c:178
752
+#: advice.c:181
753
msgid "Cherry-picking is not possible because you have unmerged files."
754
msgstr ""
755
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
756
"samman."
757
760
-#: advice.c:180
758
+#: advice.c:183
759
msgid "Committing is not possible because you have unmerged files."
760
msgstr ""
761
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
762
"samman."
763
766
-#: advice.c:182
764
+#: advice.c:185
765
msgid "Merging is not possible because you have unmerged files."
766
msgstr ""
767
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
768
"samman."
769
772
-#: advice.c:184
770
+#: advice.c:187
771
msgid "Pulling is not possible because you have unmerged files."
772
msgstr ""
773
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
774
777
-#: advice.c:186
775
+#: advice.c:189
776
msgid "Reverting is not possible because you have unmerged files."
777
msgstr ""
778
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
779
"samman."
780
783
-#: advice.c:188
781
+#: advice.c:191
782
#, c-format
783
msgid "It is not possible to %s because you have unmerged files."
784
msgstr ""
785
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
786
789
-#: advice.c:196
787
+#: advice.c:199
788
msgid ""
789
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
790
"as appropriate to mark resolution and make a commit."
@@ -794,27 +792,27 @@ msgstr ""
792
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
793
"som lämpligt för att ange lösning och checka in."
794
797
-#: advice.c:204
795
+#: advice.c:207
796
msgid "Exiting because of an unresolved conflict."
797
msgstr "Avslutar på grund av olöst konflikgt."
798
801
-#: advice.c:209 builtin/merge.c:1382
799
+#: advice.c:212 builtin/merge.c:1388
800
msgid "You have not concluded your merge (MERGE_HEAD exists)."
801
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
802
805
-#: advice.c:211
803
+#: advice.c:214
804
msgid "Please, commit your changes before merging."
805
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
806
809
-#: advice.c:212
807
+#: advice.c:215
808
msgid "Exiting because of unfinished merge."
809
msgstr "Avslutar på grund av ofullbordad sammanslagning."
810
813
-#: advice.c:217
811
+#: advice.c:220
812
msgid "Not possible to fast-forward, aborting."
813
msgstr "Kan inte snabbspola, avbryter."
814
817
-#: advice.c:227
815
+#: advice.c:230
816
#, c-format
817
msgid ""
818
"The following paths and/or pathspecs matched paths that exist\n"
@@ -825,7 +823,7 @@ msgstr ""
823
"utanför din \"sparse-checkout\"-definition, så de kommer inte\n"
824
"uppdateras i indexet:\n"
825
828
-#: advice.c:234
826
+#: advice.c:237
827
msgid ""
828
"If you intend to update such entries, try one of the following:\n"
829
"* Use the --sparse option.\n"
@@ -835,7 +833,7 @@ msgstr ""
833
"* Använd flaggan --sparse.\n"
834
"* Inaktivera eller ändra reglerna för gles utcheckning."
835
838
-#: advice.c:242
836
+#: advice.c:245
837
#, c-format
838
msgid ""
839
"Note: switching to '%s'.\n"
@@ -896,80 +894,83 @@ msgstr "okänt alternativ för whitespace: \"%s\""
894
msgid "unrecognized whitespace ignore option '%s'"
895
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
896
899
-#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
900
-#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
901
-#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
902
-#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
903
-#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
904
-#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
905
-#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
906
-#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
907
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
908
-#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
909
-#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
910
-#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
911
-#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
912
-#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
913
-#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
914
-#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
915
-#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
916
-#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
917
-#: builtin/worktree.c:702
897
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
898
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
899
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
900
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
901
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
902
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
903
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
904
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
905
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
906
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
907
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
908
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
909
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
910
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
911
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
912
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
913
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
914
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
915
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
916
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
917
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
918
+#: builtin/worktree.c:779
919
#, c-format
920
msgid "options '%s' and '%s' cannot be used together"
921
msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
922
922
-#: apply.c:139 apply.c:150 apply.c:153
923
+#: apply.c:141 apply.c:152 apply.c:155
924
#, c-format
925
msgid "'%s' outside a repository"
926
msgstr "\"%s\" utanför arkiv"
927
927
-#: apply.c:800
928
+#: apply.c:807
929
#, c-format
930
msgid "Cannot prepare timestamp regexp %s"
931
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
932
932
-#: apply.c:809
933
+#: apply.c:816
934
#, c-format
935
msgid "regexec returned %d for input: %s"
936
msgstr "regexec returnerade %d för indata: %s"
937
937
-#: apply.c:883
938
+#: apply.c:890
939
#, c-format
940
msgid "unable to find filename in patch at line %d"
941
msgstr "kan inte hitta filnamn i patchen på rad %d"
942
942
-#: apply.c:921
943
+#: apply.c:928
944
#, c-format
945
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
946
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
947
947
-#: apply.c:927
948
+#: apply.c:934
949
#, c-format
950
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
951
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
952
952
-#: apply.c:928
953
+#: apply.c:935
954
#, c-format
955
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
956
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
957
957
-#: apply.c:933
958
+#: apply.c:940
959
#, c-format
960
msgid "git apply: bad git-diff - expected /dev/null on line %d"
961
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
962
962
-#: apply.c:962
963
+#: apply.c:969
964
#, c-format
965
msgid "invalid mode on line %d: %s"
966
msgstr "ogiltigt läge på rad %d: %s"
967
967
-#: apply.c:1281
968
+#: apply.c:1288
969
#, c-format
970
msgid "inconsistent header lines %d and %d"
971
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
972
972
-#: apply.c:1371
973
+#: apply.c:1378
974
#, c-format
975
msgid ""
976
"git diff header lacks filename information when removing %d leading pathname "
@@ -985,92 +986,92 @@ msgstr[1] ""
986
"sökvägskomponenter\n"
987
"tas bort (rad %d)"
988
988
-#: apply.c:1384
989
+#: apply.c:1391
990
#, c-format
991
msgid "git diff header lacks filename information (line %d)"
992
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
993
993
-#: apply.c:1480
994
+#: apply.c:1487
995
#, c-format
996
msgid "recount: unexpected line: %.*s"
997
msgstr "recount: oväntad rad: %.*s"
998
998
-#: apply.c:1549
999
+#: apply.c:1556
1000
#, c-format
1001
msgid "patch fragment without header at line %d: %.*s"
1002
msgstr "patch-fragment utan huvud på rad %d: %.*s"
1003
1003
-#: apply.c:1752
1004
+#: apply.c:1759
1005
msgid "new file depends on old contents"
1006
msgstr "ny fil beror på gammalt innehåll"
1007
1007
-#: apply.c:1754
1008
+#: apply.c:1761
1009
msgid "deleted file still has contents"
1010
msgstr "borttagen fil har fortfarande innehåll"
1011
1011
-#: apply.c:1788
1012
+#: apply.c:1795
1013
#, c-format
1014
msgid "corrupt patch at line %d"
1015
msgstr "trasig patch på rad %d"
1016
1016
-#: apply.c:1825
1017
+#: apply.c:1832
1018
#, c-format
1019
msgid "new file %s depends on old contents"
1020
msgstr "nya filen %s beror på gammalt innehåll"
1021
1021
-#: apply.c:1827
1022
+#: apply.c:1834
1023
#, c-format
1024
msgid "deleted file %s still has contents"
1025
msgstr "borttagna filen %s har fortfarande innehåll"
1026
1026
-#: apply.c:1830
1027
+#: apply.c:1837
1028
#, c-format
1029
msgid "** warning: file %s becomes empty but is not deleted"
1030
msgstr "** varning: filen %s blir tom men har inte tagits bort"
1031
1031
-#: apply.c:1978
1032
+#: apply.c:1985
1033
#, c-format
1034
msgid "corrupt binary patch at line %d: %.*s"
1035
msgstr "trasig binärpatch på rad %d: %.*s"
1036
1036
-#: apply.c:2015
1037
+#: apply.c:2022
1038
#, c-format
1039
msgid "unrecognized binary patch at line %d"
1040
msgstr "binärpatchen på rad %d känns inte igen"
1041
1041
-#: apply.c:2177
1042
+#: apply.c:2184
1043
#, c-format
1044
msgid "patch with only garbage at line %d"
1045
msgstr "patch med bara skräp på rad %d"
1046
1046
-#: apply.c:2263
1047
+#: apply.c:2270
1048
#, c-format
1049
msgid "unable to read symlink %s"
1050
msgstr "kunde inte läsa symboliska länken %s"
1051
1051
-#: apply.c:2267
1052
+#: apply.c:2274
1053
#, c-format
1054
msgid "unable to open or read %s"
1055
msgstr "kunde inte öppna eller läsa %s"
1056
1056
-#: apply.c:2936
1057
+#: apply.c:2943
1058
#, c-format
1059
msgid "invalid start of line: '%c'"
1060
msgstr "felaktig inledning på rad: \"%c\""
1061
1061
-#: apply.c:3057
1062
+#: apply.c:3064
1063
#, c-format
1064
msgid "Hunk #%d succeeded at %d (offset %d line)."
1065
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1066
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
1067
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
1068
1068
-#: apply.c:3069
1069
+#: apply.c:3076
1070
#, c-format
1071
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1072
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
1073
1073
-#: apply.c:3075
1074
+#: apply.c:3082
1075
#, c-format
1076
msgid ""
1077
"while searching for:\n"
@@ -1079,25 +1080,25 @@ msgstr ""
1080
"vid sökning efter:\n"
1081
"%.*s"
1082
1082
-#: apply.c:3097
1083
+#: apply.c:3104
1084
#, c-format
1085
msgid "missing binary patch data for '%s'"
1086
msgstr "saknar binära patchdata för \"%s\""
1087
1087
-#: apply.c:3105
1088
+#: apply.c:3112
1089
#, c-format
1090
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1091
msgstr ""
1092
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
1093
"\""
1094
1094
-#: apply.c:3152
1095
+#: apply.c:3159
1096
#, c-format
1097
msgid "cannot apply binary patch to '%s' without full index line"
1098
msgstr ""
1099
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
1100
1100
-#: apply.c:3163
1101
+#: apply.c:3170
1102
#, c-format
1103
msgid ""
1104
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -1105,427 +1106,427 @@ msgstr ""
1106
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
1107
"innehållet."
1108
1108
-#: apply.c:3171
1109
+#: apply.c:3178
1110
#, c-format
1111
msgid "the patch applies to an empty '%s' but it is not empty"
1112
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
1113
1113
-#: apply.c:3189
1114
+#: apply.c:3196
1115
#, c-format
1116
msgid "the necessary postimage %s for '%s' cannot be read"
1117
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
1118
1118
-#: apply.c:3202
1119
+#: apply.c:3209
1120
#, c-format
1121
msgid "binary patch does not apply to '%s'"
1122
msgstr "binärpatchen kan inte tillämpas på \"%s\""
1123
1123
-#: apply.c:3209
1124
+#: apply.c:3216
1125
#, c-format
1126
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1127
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
1128
1128
-#: apply.c:3230
1129
+#: apply.c:3237
1130
#, c-format
1131
msgid "patch failed: %s:%ld"
1132
msgstr "patch misslyckades: %s:%ld"
1133
1133
-#: apply.c:3353
1134
+#: apply.c:3360
1135
#, c-format
1136
msgid "cannot checkout %s"
1137
msgstr "kan inte checka ut %s"
1138
1138
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1139
-#: setup.c:309
1139
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1140
+#: setup.c:310
1141
#, c-format
1142
msgid "failed to read %s"
1143
msgstr "misslyckades läsa %s"
1144
1144
-#: apply.c:3413
1145
+#: apply.c:3420
1146
#, c-format
1147
msgid "reading from '%s' beyond a symbolic link"
1148
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
1149
1149
-#: apply.c:3442 apply.c:3711
1150
+#: apply.c:3449 apply.c:3721
1151
#, c-format
1152
msgid "path %s has been renamed/deleted"
1153
msgstr "sökvägen %s har ändrat namn/tagits bort"
1154
1154
-#: apply.c:3549 apply.c:3726
1155
+#: apply.c:3559 apply.c:3736
1156
#, c-format
1157
msgid "%s: does not exist in index"
1158
msgstr "%s: finns inte i indexet"
1159
1159
-#: apply.c:3558 apply.c:3734 apply.c:3978
1160
+#: apply.c:3568 apply.c:3744 apply.c:3960
1161
#, c-format
1162
msgid "%s: does not match index"
1163
msgstr "%s: motsvarar inte indexet"
1164
1164
-#: apply.c:3595
1165
+#: apply.c:3605
1166
msgid "repository lacks the necessary blob to perform 3-way merge."
1167
msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."
1168
1168
-#: apply.c:3598
1169
+#: apply.c:3608
1170
#, c-format
1171
msgid "Performing three-way merge...\n"
1172
msgstr "Utför trevägssammanslagning...\n"
1173
1173
-#: apply.c:3614 apply.c:3618
1174
+#: apply.c:3624 apply.c:3628
1175
#, c-format
1176
msgid "cannot read the current contents of '%s'"
1177
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
1178
1178
-#: apply.c:3630
1179
+#: apply.c:3640
1180
#, c-format
1181
msgid "Failed to perform three-way merge...\n"
1182
msgstr "Misslyckades utföra trevägssammanslagning...\n"
1183
1183
-#: apply.c:3644
1184
+#: apply.c:3654
1185
#, c-format
1186
msgid "Applied patch to '%s' with conflicts.\n"
1187
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
1188
1188
-#: apply.c:3649
1189
+#: apply.c:3659
1190
#, c-format
1191
msgid "Applied patch to '%s' cleanly.\n"
1192
msgstr "Tillämpade patchen på \"%s\" rent.\n"
1193
1193
-#: apply.c:3666
1194
+#: apply.c:3676
1195
#, c-format
1196
msgid "Falling back to direct application...\n"
1197
msgstr "Faller tillbaka på direkt tillämpning...\n"
1198
1198
-#: apply.c:3678
1199
+#: apply.c:3688
1200
msgid "removal patch leaves file contents"
1201
msgstr "patch för borttagning lämnar kvar filinnehåll"
1202
1202
-#: apply.c:3751
1203
+#: apply.c:3761
1204
#, c-format
1205
msgid "%s: wrong type"
1206
msgstr "%s: fel typ"
1207
1207
-#: apply.c:3753
1208
+#: apply.c:3763
1209
#, c-format
1210
msgid "%s has type %o, expected %o"
1211
msgstr "%s har typen %o, förväntade %o"
1212
1212
-#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1213
-#: read-cache.c:1381
1213
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1214
+#: read-cache.c:1399
1215
#, c-format
1216
msgid "invalid path '%s'"
1217
msgstr "ogiltig sökväg \"%s\""
1218
1218
-#: apply.c:3976
1219
+#: apply.c:3958
1220
#, c-format
1221
msgid "%s: already exists in index"
1222
msgstr "%s: finns redan i indexet"
1223
1223
-#: apply.c:3980
1224
+#: apply.c:3962
1225
#, c-format
1226
msgid "%s: already exists in working directory"
1227
msgstr "%s: finns redan i arbetskatalogen"
1228
1228
-#: apply.c:4000
1229
+#: apply.c:3982
1230
#, c-format
1231
msgid "new mode (%o) of %s does not match old mode (%o)"
1232
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
1233
1233
-#: apply.c:4005
1234
+#: apply.c:3987
1235
#, c-format
1236
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1237
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
1238
1238
-#: apply.c:4025
1239
+#: apply.c:4007
1240
#, c-format
1241
msgid "affected file '%s' is beyond a symbolic link"
1242
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
1243
1243
-#: apply.c:4029
1244
+#: apply.c:4011
1245
#, c-format
1246
msgid "%s: patch does not apply"
1247
msgstr "%s: patchen kan inte tillämpas"
1248
1248
-#: apply.c:4044
1249
+#: apply.c:4026
1250
#, c-format
1251
msgid "Checking patch %s..."
1252
msgstr "Kontrollerar patchen %s..."
1253
1253
-#: apply.c:4136
1254
+#: apply.c:4118
1255
#, c-format
1256
msgid "sha1 information is lacking or useless for submodule %s"
1257
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
1258
1258
-#: apply.c:4143
1259
+#: apply.c:4125
1260
#, c-format
1261
msgid "mode change for %s, which is not in current HEAD"
1262
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
1263
1263
-#: apply.c:4146
1264
+#: apply.c:4128
1265
#, c-format
1266
msgid "sha1 information is lacking or useless (%s)."
1267
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
1268
1268
-#: apply.c:4155
1269
+#: apply.c:4137
1270
#, c-format
1271
msgid "could not add %s to temporary index"
1272
msgstr "kunde inte lägga till %s till temporärt index"
1273
1273
-#: apply.c:4165
1274
+#: apply.c:4147
1275
#, c-format
1276
msgid "could not write temporary index to %s"
1277
msgstr "kunde inte skriva temporärt index till %s"
1278
1278
-#: apply.c:4303
1279
+#: apply.c:4285
1280
#, c-format
1281
msgid "unable to remove %s from index"
1282
msgstr "kan inte ta bort %s från indexet"
1283
1283
-#: apply.c:4337
1284
+#: apply.c:4319
1285
#, c-format
1286
msgid "corrupt patch for submodule %s"
1287
msgstr "trasig patch för undermodulen %s"
1288
1288
-#: apply.c:4343
1289
+#: apply.c:4325
1290
#, c-format
1291
msgid "unable to stat newly created file '%s'"
1292
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
1293
1293
-#: apply.c:4351
1294
+#: apply.c:4333
1295
#, c-format
1296
msgid "unable to create backing store for newly created file %s"
1297
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
1298
1298
-#: apply.c:4357 apply.c:4502
1299
+#: apply.c:4339 apply.c:4484
1300
#, c-format
1301
msgid "unable to add cache entry for %s"
1302
msgstr "kan inte lägga till cachepost för %s"
1303
1303
-#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1304
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1305
#: builtin/gc.c:2293
1306
#, c-format
1307
msgid "failed to write to '%s'"
1308
msgstr "misslyckades skriva till \"%s\""
1309
1309
-#: apply.c:4404
1310
+#: apply.c:4386
1311
#, c-format
1312
msgid "closing file '%s'"
1313
msgstr "stänger filen \"%s\""
1314
1314
-#: apply.c:4474
1315
+#: apply.c:4456
1316
#, c-format
1317
msgid "unable to write file '%s' mode %o"
1318
msgstr "kan inte skriva filen \"%s\" läge %o"
1319
1319
-#: apply.c:4572
1320
+#: apply.c:4554
1321
#, c-format
1322
msgid "Applied patch %s cleanly."
1323
msgstr "Tillämpade patchen %s rent."
1324
1324
-#: apply.c:4580
1325
+#: apply.c:4562
1326
msgid "internal error"
1327
msgstr "internt fel"
1328
1328
-#: apply.c:4583
1329
+#: apply.c:4565
1330
#, c-format
1331
msgid "Applying patch %%s with %d reject..."
1332
msgid_plural "Applying patch %%s with %d rejects..."
1333
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
1334
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
1335
1335
-#: apply.c:4594
1336
+#: apply.c:4576
1337
#, c-format
1338
msgid "truncating .rej filename to %.*s.rej"
1339
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
1340
1340
-#: apply.c:4602
1341
+#: apply.c:4584
1342
#, c-format
1343
msgid "cannot open %s"
1344
msgstr "kan inte öppna %s"
1345
1345
-#: apply.c:4616
1346
+#: apply.c:4598
1347
#, c-format
1348
msgid "Hunk #%d applied cleanly."
1349
msgstr "Stycke %d tillämpades rent."
1350
1350
-#: apply.c:4620
1351
+#: apply.c:4602
1352
#, c-format
1353
msgid "Rejected hunk #%d."
1354
msgstr "Refuserar stycke %d."
1355
1355
-#: apply.c:4749
1356
+#: apply.c:4731
1357
#, c-format
1358
msgid "Skipped patch '%s'."
1359
msgstr "Ignorerar patch \"%s\"."
1360
1360
-#: apply.c:4758
1361
+#: apply.c:4740
1362
msgid "No valid patches in input (allow with \"--allow-empty\")"
1363
msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"
1364
1364
-#: apply.c:4779
1365
+#: apply.c:4761
1366
msgid "unable to read index file"
1367
msgstr "kan inte läsa indexfilen"
1368
1368
-#: apply.c:4936
1369
+#: apply.c:4918
1370
#, c-format
1371
msgid "can't open patch '%s': %s"
1372
msgstr "kan inte öppna patchen \"%s\": %s"
1373
1373
-#: apply.c:4963
1374
+#: apply.c:4945
1375
#, c-format
1376
msgid "squelched %d whitespace error"
1377
msgid_plural "squelched %d whitespace errors"
1378
msgstr[0] "undertryckte %d fel i blanksteg"
1379
msgstr[1] "undertryckte %d fel i blanksteg"
1380
1380
-#: apply.c:4969 apply.c:4984
1381
+#: apply.c:4951 apply.c:4966
1382
#, c-format
1383
msgid "%d line adds whitespace errors."
1384
msgid_plural "%d lines add whitespace errors."
1385
msgstr[0] "%d rad lägger till fel i blanksteg."
1386
msgstr[1] "%d rader lägger till fel i blanksteg."
1387
1387
-#: apply.c:4977
1388
+#: apply.c:4959
1389
#, c-format
1390
msgid "%d line applied after fixing whitespace errors."
1391
msgid_plural "%d lines applied after fixing whitespace errors."
1392
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
1393
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
1394
1394
-#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
1395
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1396
msgid "Unable to write new index file"
1397
msgstr "Kunde inte skriva ny indexfil"
1398
1398
-#: apply.c:5021
1399
+#: apply.c:5003
1400
msgid "don't apply changes matching the given path"
1401
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
1402
1402
-#: apply.c:5024
1403
+#: apply.c:5006
1404
msgid "apply changes matching the given path"
1405
msgstr "tillämpa ändringar som motsvarar given sökväg"
1406
1406
-#: apply.c:5026 builtin/am.c:2376
1407
+#: apply.c:5008 builtin/am.c:2379
1408
msgid "num"
1409
msgstr "antal"
1410
1410
-#: apply.c:5027
1411
+#: apply.c:5009
1412
msgid "remove <num> leading slashes from traditional diff paths"
1413
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
1414
1414
-#: apply.c:5030
1415
+#: apply.c:5012
1416
msgid "ignore additions made by the patch"
1417
msgstr "ignorera tillägg gjorda av patchen"
1418
1418
-#: apply.c:5032
1419
+#: apply.c:5014
1420
msgid "instead of applying the patch, output diffstat for the input"
1421
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
1422
1422
-#: apply.c:5036
1423
+#: apply.c:5018
1424
msgid "show number of added and deleted lines in decimal notation"
1425
msgstr "visa antal tillagda och borttagna rader decimalt"
1426
1426
-#: apply.c:5038
1427
+#: apply.c:5020
1428
msgid "instead of applying the patch, output a summary for the input"
1429
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
1430
1430
-#: apply.c:5040
1431
+#: apply.c:5022
1432
msgid "instead of applying the patch, see if the patch is applicable"
1433
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
1434
1434
-#: apply.c:5042
1435
+#: apply.c:5024
1436
msgid "make sure the patch is applicable to the current index"
1437
msgstr "se till att patchen kan tillämpas på aktuellt index"
1438
1438
-#: apply.c:5044
1439
+#: apply.c:5026
1440
msgid "mark new files with `git add --intent-to-add`"
1441
msgstr "markera nya filer med \"git add --intent-to-add\""
1442
1442
-#: apply.c:5046
1443
+#: apply.c:5028
1444
msgid "apply a patch without touching the working tree"
1445
msgstr "tillämpa en patch utan att röra arbetskatalogen"
1446
1446
-#: apply.c:5048
1447
+#: apply.c:5030
1448
msgid "accept a patch that touches outside the working area"
1449
msgstr "godta en patch som rör filer utanför arbetskatalogen"
1450
1450
-#: apply.c:5051
1451
+#: apply.c:5033
1452
msgid "also apply the patch (use with --stat/--summary/--check)"
1453
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
1454
1454
-#: apply.c:5053
1455
+#: apply.c:5035
1456
msgid "attempt three-way merge, fall back on normal patch if that fails"
1457
msgstr ""
1458
"försök en trevägssammanslagning, fall tillbaka på normal patch om det "
1459
"misslyckas"
1460
1460
-#: apply.c:5055
1461
+#: apply.c:5037
1462
msgid "build a temporary index based on embedded index information"
1463
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
1464
1464
-#: apply.c:5058 builtin/checkout-index.c:196
1465
+#: apply.c:5040 builtin/checkout-index.c:230
1466
msgid "paths are separated with NUL character"
1467
msgstr "sökvägar avdelas med NUL-tecken"
1468
1468
-#: apply.c:5060
1469
+#: apply.c:5042
1470
msgid "ensure at least <n> lines of context match"
1471
msgstr "se till att åtminstone <n> rader sammanhang är lika"
1472
1472
-#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
1473
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1474
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1474
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1475
-#: builtin/rebase.c:1051
1475
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1476
+#: builtin/rebase.c:1079
1477
msgid "action"
1478
msgstr "åtgärd"
1479
1479
-#: apply.c:5062
1480
+#: apply.c:5044
1481
msgid "detect new or modified lines that have whitespace errors"
1482
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
1483
1483
-#: apply.c:5065 apply.c:5068
1484
+#: apply.c:5047 apply.c:5050
1485
msgid "ignore changes in whitespace when finding context"
1486
msgstr "ignorera ändringar i blanktecken för sammanhang"
1487
1487
-#: apply.c:5071
1488
+#: apply.c:5053
1489
msgid "apply the patch in reverse"
1490
msgstr "tillämpa patchen baklänges"
1491
1491
-#: apply.c:5073
1492
+#: apply.c:5055
1493
msgid "don't expect at least one line of context"
1494
msgstr "förvänta inte minst en rad sammanhang"
1495
1495
-#: apply.c:5075
1496
+#: apply.c:5057
1497
msgid "leave the rejected hunks in corresponding *.rej files"
1498
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
1499
1499
-#: apply.c:5077
1500
+#: apply.c:5059
1501
msgid "allow overlapping hunks"
1502
msgstr "tillåt överlappande stycken"
1503
1503
-#: apply.c:5080
1504
+#: apply.c:5062
1505
msgid "tolerate incorrectly detected missing new-line at the end of file"
1506
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
1507
1507
-#: apply.c:5083
1508
+#: apply.c:5065
1509
msgid "do not trust the line counts in the hunk headers"
1510
msgstr "lite inte på antalet linjer i styckehuvuden"
1511
1511
-#: apply.c:5085 builtin/am.c:2364
1512
+#: apply.c:5067 builtin/am.c:2367
1513
msgid "root"
1514
msgstr "rot"
1515
1515
-#: apply.c:5086
1516
+#: apply.c:5068
1517
msgid "prepend <root> to all filenames"
1518
msgstr "lägg till <rot> i alla filnamn"
1519
1519
-#: apply.c:5089
1520
+#: apply.c:5071
1521
msgid "don't return error for empty patches"
1522
msgstr "ge inte någon felkod för tomma patchar"
1523
1523
-#: archive-tar.c:125 archive-zip.c:345
1524
+#: archive-tar.c:125 archive-zip.c:346
1525
#, c-format
1526
msgid "cannot stream blob %s"
1527
msgstr "kan inte strömma blob:en %s"
1528
1528
-#: archive-tar.c:265 archive-zip.c:358
1529
+#: archive-tar.c:265 archive-zip.c:359
1530
#, c-format
1531
msgid "unsupported file mode: 0%o (SHA1: %s)"
1532
msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
@@ -1544,22 +1545,22 @@ msgstr "kan inte omdirigera handtag"
1545
msgid "'%s' filter reported error"
1546
msgstr "filtret \"%s\" rapporterade fel"
1547
1547
-#: archive-zip.c:318
1548
+#: archive-zip.c:319
1549
#, c-format
1550
msgid "path is not valid UTF-8: %s"
1551
msgstr "sökvägen är inte giltig UTF-8: %s"
1552
1552
-#: archive-zip.c:322
1553
+#: archive-zip.c:323
1554
#, c-format
1555
msgid "path too long (%d chars, SHA1: %s): %s"
1556
msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
1557
1557
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
1558
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1559
#, c-format
1560
msgid "deflate error (%d)"
1561
msgstr "fel i deflate (%d)"
1562
1562
-#: archive-zip.c:603
1563
+#: archive-zip.c:604
1564
#, c-format
1565
msgid "timestamp too large for this system: %<PRIuMAX>"
1566
msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
@@ -1568,10 +1569,6 @@ msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
1569
msgid "git archive [<options>] <tree-ish> [<path>...]"
1570
msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
1571
1571
-#: archive.c:15
1572
-msgid "git archive --list"
1573
-msgstr "git archive --list"
1574
-
1572
#: archive.c:16
1573
msgid ""
1574
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
@@ -1584,12 +1581,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list"
1581
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
1582
1583
#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1587
-#: builtin/tag.c:578
1584
+#: builtin/tag.c:579
1585
#, c-format
1586
msgid "cannot read '%s'"
1587
msgstr "kunde inte läsa \"%s\""
1588
1592
-#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
1589
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1590
#, c-format
1591
msgid "pathspec '%s' did not match any files"
1592
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1631,7 +1628,7 @@ msgstr "fmt"
1628
msgid "archive format"
1629
msgstr "arkivformat"
1630
1634
-#: archive.c:552 builtin/log.c:1790
1631
+#: archive.c:552 builtin/log.c:1809
1632
msgid "prefix"
1633
msgstr "prefix"
1634
@@ -1639,12 +1636,12 @@ msgstr "prefix"
1636
msgid "prepend prefix to each pathname in the archive"
1637
msgstr "lägg till prefix till varje sökväg i arkivet"
1638
1642
-#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1643
-#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1639
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1640
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1641
#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1645
-#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
1642
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1643
#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1647
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
1644
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1645
msgid "file"
1646
msgstr "fil"
1647
@@ -1672,8 +1669,8 @@ msgstr "välj komprimeringsgrad"
1669
msgid "list supported archive formats"
1670
msgstr "visa understödda arkivformat"
1671
1675
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1676
-#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
1672
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1673
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1674
msgid "repo"
1675
msgstr "arkiv"
1676
@@ -1694,11 +1691,12 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren"
1691
msgid "Unexpected option --remote"
1692
msgstr "Oväntad flagga --remote"
1693
1697
-#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
1698
-#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
1699
-#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
1700
-#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
1701
-#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
1694
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1695
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1696
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1697
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1698
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1699
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1700
#: http-fetch.c:153
1701
#, c-format
1702
msgid "the option '%s' requires '%s'"
@@ -1718,17 +1716,17 @@ msgstr "Okänt arkivformat \"%s\""
1716
msgid "Argument not supported for format '%s': -%d"
1717
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
1718
1721
-#: attr.c:203
1719
+#: attr.c:202
1720
#, c-format
1721
msgid "%.*s is not a valid attribute name"
1722
msgstr "%-*s är inte ett giltigt namn på attribut"
1723
1726
-#: attr.c:364
1724
+#: attr.c:363
1725
#, c-format
1726
msgid "%s not allowed: %s:%d"
1727
msgstr "%s inte tillåtet: %s:%d"
1728
1731
-#: attr.c:404
1729
+#: attr.c:403
1730
msgid ""
1731
"Negative patterns are ignored in git attributes\n"
1732
"Use '\\!' for literal leading exclamation."
@@ -1746,12 +1744,12 @@ msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
1744
msgid "We cannot bisect more!\n"
1745
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
1746
1749
-#: bisect.c:764
1747
+#: bisect.c:765
1748
#, c-format
1749
msgid "Not a valid commit name %s"
1750
msgstr "Namnet på incheckningen är inte giltigt: %s"
1751
1754
-#: bisect.c:789
1752
+#: bisect.c:790
1753
#, c-format
1754
msgid ""
1755
"The merge base %s is bad.\n"
@@ -1760,7 +1758,7 @@ msgstr ""
1758
"Sammanslagningsbasen %s är trasig.\n"
1759
"Det betyder att felet har rättats mellan %s och [%s].\n"
1760
1763
-#: bisect.c:794
1761
+#: bisect.c:795
1762
#, c-format
1763
msgid ""
1764
"The merge base %s is new.\n"
@@ -1769,7 +1767,7 @@ msgstr ""
1767
"Sammanslagningsbasen %s är ny.\n"
1768
"Egenskapen har ändrats mellan %s och [%s].\n"
1769
1772
-#: bisect.c:799
1770
+#: bisect.c:800
1771
#, c-format
1772
msgid ""
1773
"The merge base %s is %s.\n"
@@ -1778,7 +1776,7 @@ msgstr ""
1776
"Sammanslagningsbasen %s är %s.\n"
1777
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
1778
1781
-#: bisect.c:807
1779
+#: bisect.c:808
1780
#, c-format
1781
msgid ""
1782
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1789,7 +1787,7 @@ msgstr ""
1787
"git bisect kan inte fungera korrekt i detta fall.\n"
1788
"Kanske du skrev fel %s- och %s-revisioner?\n"
1789
1792
-#: bisect.c:820
1790
+#: bisect.c:821
1791
#, c-format
1792
msgid ""
1793
"the merge base between %s and [%s] must be skipped.\n"
@@ -1801,36 +1799,36 @@ msgstr ""
1799
"%s.\n"
1800
"Vi fortsätter ändå."
1801
1804
-#: bisect.c:859
1802
+#: bisect.c:860
1803
#, c-format
1804
msgid "Bisecting: a merge base must be tested\n"
1805
msgstr "Bisect: en sammanslagningsbas måste testas\n"
1806
1809
-#: bisect.c:909
1807
+#: bisect.c:910
1808
#, c-format
1809
msgid "a %s revision is needed"
1810
msgstr "en %s-revision behövs"
1811
1814
-#: bisect.c:939
1812
+#: bisect.c:940
1813
#, c-format
1814
msgid "could not create file '%s'"
1815
msgstr "kunde inte skapa filen \"%s\""
1816
1819
-#: bisect.c:985 builtin/merge.c:155
1817
+#: bisect.c:986 builtin/merge.c:155
1818
#, c-format
1819
msgid "could not read file '%s'"
1820
msgstr "kunde inte läsa filen \"%s\""
1821
1824
-#: bisect.c:1025
1822
+#: bisect.c:1026
1823
msgid "reading bisect refs failed"
1824
msgstr "misslyckades läsa bisect-referenser"
1825
1828
-#: bisect.c:1055
1826
+#: bisect.c:1056
1827
#, c-format
1828
msgid "%s was both %s and %s\n"
1829
msgstr "%s var både %s och %s\n"
1830
1833
-#: bisect.c:1064
1831
+#: bisect.c:1065
1832
#, c-format
1833
msgid ""
1834
"No testable commit found.\n"
@@ -1839,7 +1837,7 @@ msgstr ""
1837
"Ingen testbar incheckning hittades.\n"
1838
"Kanske du startade med felaktiga sökvägsargument?\n"
1839
1842
-#: bisect.c:1093
1840
+#: bisect.c:1094
1841
#, c-format
1842
msgid "(roughly %d step)"
1843
msgid_plural "(roughly %d steps)"
@@ -1849,54 +1847,54 @@ msgstr[1] "(ungefär %d steg)"
1847
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1848
#. steps)" translation.
1849
#.
1852
-#: bisect.c:1099
1850
+#: bisect.c:1100
1851
#, c-format
1852
msgid "Bisecting: %d revision left to test after this %s\n"
1853
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1854
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
1855
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
1856
1859
-#: blame.c:2776
1857
+#: blame.c:2773
1858
msgid "--contents and --reverse do not blend well."
1859
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
1860
1863
-#: blame.c:2790
1861
+#: blame.c:2787
1862
msgid "cannot use --contents with final commit object name"
1863
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
1864
1867
-#: blame.c:2811
1865
+#: blame.c:2808
1866
msgid "--reverse and --first-parent together require specified latest commit"
1867
msgstr ""
1868
"--reverse och --first-parent tillsammans kräver att du anger senaste "
1869
"incheckningen"
1870
1873
-#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
1874
-#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
1875
-#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
1876
-#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
1877
-#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1871
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1872
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1873
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1874
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1875
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1876
#: builtin/shortlog.c:255
1877
msgid "revision walk setup failed"
1878
msgstr "misslyckades skapa revisionstraversering"
1879
1882
-#: blame.c:2838
1880
+#: blame.c:2835
1881
msgid ""
1882
"--reverse --first-parent together require range along first-parent chain"
1883
msgstr ""
1884
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
1885
"kedjan"
1886
1889
-#: blame.c:2849
1887
+#: blame.c:2846
1888
#, c-format
1889
msgid "no such path %s in %s"
1890
msgstr "sökvägen %s i %s finns inte"
1891
1894
-#: blame.c:2860
1892
+#: blame.c:2857
1893
#, c-format
1894
msgid "cannot read blob %s for path %s"
1895
msgstr "kan inte läsa objektet %s för sökvägen %s"
1896
1899
-#: branch.c:77
1897
+#: branch.c:93
1898
msgid ""
1899
"cannot inherit upstream tracking configuration of multiple refs when "
1900
"rebasing is requested"
@@ -1904,31 +1902,31 @@ msgstr ""
1902
"kan inte ärva uppströmsspårningsinformation från flera referenser när "
1903
"ombasering är vald"
1904
1907
-#: branch.c:88
1905
+#: branch.c:104
1906
#, c-format
1907
msgid "not setting branch '%s' as its own upstream"
1908
msgstr "ställer inte in grenen %s som sin egen uppströmsgren"
1909
1912
-#: branch.c:144
1910
+#: branch.c:160
1911
#, c-format
1912
msgid "branch '%s' set up to track '%s' by rebasing."
1913
msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."
1914
1917
-#: branch.c:145
1915
+#: branch.c:161
1916
#, c-format
1917
msgid "branch '%s' set up to track '%s'."
1918
msgstr "grenen \"%s\" inställd på att spåra \"%s\"."
1919
1922
-#: branch.c:148
1920
+#: branch.c:164
1921
#, c-format
1922
msgid "branch '%s' set up to track:"
1923
msgstr "grenen \"%s\" inställd på att spåra:"
1924
1927
-#: branch.c:160
1925
+#: branch.c:176
1926
msgid "unable to write upstream branch configuration"
1927
msgstr "kan inte skriva inställningar för uppströmsgren"
1928
1931
-#: branch.c:162
1929
+#: branch.c:178
1930
msgid ""
1931
"\n"
1932
"After fixing the error cause you may try to fix up\n"
@@ -1938,51 +1936,89 @@ msgstr ""
1936
"När du har rättat felorsaken kan du försöka rätta\n"
1937
"fjärrspårningsinformationen genom att utföra:"
1938
1941
-#: branch.c:203
1939
+#: branch.c:219
1940
#, c-format
1941
msgid "asked to inherit tracking from '%s', but no remote is set"
1942
msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"
1943
1946
-#: branch.c:209
1944
+#: branch.c:225
1945
#, c-format
1946
msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1947
msgstr ""
1948
"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "
1949
"är vald"
1950
1953
-#: branch.c:252
1951
+#: branch.c:277
1952
+#, c-format
1953
+msgid "not tracking: ambiguous information for ref '%s'"
1954
+msgstr "spårar inte: tvetydig information för referensen \"%s\""
1955
+
1956
+#. TRANSLATORS: This is a line listing a remote with duplicate
1957
+#. refspecs in the advice message below. For RTL languages you'll
1958
+#. probably want to swap the "%s" and leading " " space around.
1959
+#.
1960
+#. TRANSLATORS: This is line item of ambiguous object output
1961
+#. from describe_ambiguous_object() above. For RTL languages
1962
+#. you'll probably want to swap the "%s" and leading " " space
1963
+#. around.
1964
+#.
1965
+#: branch.c:289 object-name.c:464
1966
+#, c-format
1967
+msgid " %s\n"
1968
+msgstr " %s\n"
1969
+
1970
+#. TRANSLATORS: The second argument is a \n-delimited list of
1971
+#. duplicate refspecs, composed above.
1972
+#.
1973
+#: branch.c:295
1974
#, c-format
1955
-msgid "not tracking: ambiguous information for ref %s"
1956
-msgstr "spårar inte: tvetydig information för referensen %s"
1975
+msgid ""
1976
+"There are multiple remotes whose fetch refspecs map to the remote\n"
1977
+"tracking ref '%s':\n"
1978
+"%s\n"
1979
+"This is typically a configuration error.\n"
1980
+"\n"
1981
+"To support setting up tracking branches, ensure that\n"
1982
+"different remotes' fetch refspecs map into different\n"
1983
+"tracking namespaces."
1984
+msgstr ""
1985
+"Flera fjärrars hämtnings-referensspecifikationer motsvarar fjärr-\n"
1986
+"spårningsreferensen \"%s\":\n"
1987
+"%s\n"
1988
+"Detta är vanligtvis ett fel i konfigurationen.\n"
1989
+"\n"
1990
+"För att möjliggöra konfiguration av spårande grenar, se till att\n"
1991
+"olika fjärrars hämtnings-referensspecifikationer kopplas till\n"
1992
+"olika spårningsnamnrymder."
1993
1958
-#: branch.c:287
1994
+#: branch.c:344
1995
#, c-format
1996
msgid "'%s' is not a valid branch name"
1997
msgstr "\"%s\" är inte ett giltigt grennamn"
1998
1963
-#: branch.c:307
1999
+#: branch.c:364
2000
#, c-format
2001
msgid "a branch named '%s' already exists"
2002
msgstr "det finns redan en gren som heter \"%s\""
2003
1968
-#: branch.c:313
2004
+#: branch.c:370
2005
#, c-format
2006
msgid "cannot force update the branch '%s' checked out at '%s'"
2007
msgstr ""
2008
"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
2009
1974
-#: branch.c:336
2010
+#: branch.c:393
2011
#, c-format
2012
msgid "cannot set up tracking information; starting point '%s' is not a branch"
2013
msgstr ""
2014
"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"
2015
1980
-#: branch.c:338
2016
+#: branch.c:395
2017
#, c-format
2018
msgid "the requested upstream branch '%s' does not exist"
2019
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
2020
1985
-#: branch.c:340
2021
+#: branch.c:397
2022
msgid ""
2023
"\n"
2024
"If you are planning on basing your work on an upstream\n"
@@ -2002,126 +2038,145 @@ msgstr ""
2038
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
2039
"för att ställa in uppströmskonfigurationen när du sänder in."
2040
2005
-#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
2041
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
2042
#: builtin/replace.c:423 builtin/replace.c:453
2043
#, c-format
2044
msgid "not a valid object name: '%s'"
2045
msgstr "objektnamnet är inte giltigt: \"%s\""
2046
2011
-#: branch.c:404
2047
+#: branch.c:465
2048
#, c-format
2049
msgid "ambiguous object name: '%s'"
2050
msgstr "objektnamnet är tvetydigt: \"%s\""
2051
2016
-#: branch.c:409
2052
+#: branch.c:470
2053
#, c-format
2054
msgid "not a valid branch point: '%s'"
2055
msgstr "avgreningspunkten är inte giltig: \"%s\""
2056
2021
-#: branch.c:469
2057
+#: branch.c:658
2058
+#, c-format
2059
+msgid "submodule '%s': unable to find submodule"
2060
+msgstr "undermodulen \"%s\": kan inte hitta undermodulen"
2061
+
2062
+#: branch.c:661
2063
+#, c-format
2064
+msgid ""
2065
+"You may try updating the submodules using 'git checkout %s && git submodule "
2066
+"update --init'"
2067
+msgstr ""
2068
+"Du kan försöka uppdatera undermodulerna med \"git checkout %s && git "
2069
+"submodule update --init\""
2070
+
2071
+#: branch.c:672 branch.c:698
2072
+#, c-format
2073
+msgid "submodule '%s': cannot create branch '%s'"
2074
+msgstr "undermodulen \"%s\": kan inte skapa grenen \"%s\""
2075
+
2076
+#: branch.c:730
2077
#, c-format
2078
msgid "'%s' is already checked out at '%s'"
2079
msgstr "\"%s\" är redan utcheckad på \"%s\""
2080
2026
-#: branch.c:494
2081
+#: branch.c:755
2082
#, c-format
2083
msgid "HEAD of working tree %s is not updated"
2084
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
2085
2031
-#: bundle.c:44
2086
+#: bundle.c:45
2087
#, c-format
2088
msgid "unrecognized bundle hash algorithm: %s"
2089
msgstr "okänd hashningsalgoritm för bunt: \"%s\""
2090
2036
-#: bundle.c:48
2091
+#: bundle.c:53
2092
#, c-format
2093
msgid "unknown capability '%s'"
2094
msgstr "okänd kapabilitet \"%s\""
2095
2041
-#: bundle.c:74
2096
+#: bundle.c:79
2097
#, c-format
2098
msgid "'%s' does not look like a v2 or v3 bundle file"
2099
msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
2100
2046
-#: bundle.c:113
2101
+#: bundle.c:118
2102
#, c-format
2103
msgid "unrecognized header: %s%s (%d)"
2104
msgstr "okänt huvud: %s%s (%d)"
2105
2051
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
2052
-#: builtin/commit.c:862
2106
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
2107
+#: builtin/commit.c:865
2108
#, c-format
2109
msgid "could not open '%s'"
2110
msgstr "kunde inte öppna \"%s\""
2111
2057
-#: bundle.c:198
2112
+#: bundle.c:203
2113
msgid "Repository lacks these prerequisite commits:"
2114
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
2115
2061
-#: bundle.c:201
2116
+#: bundle.c:206
2117
msgid "need a repository to verify a bundle"
2118
msgstr "behöver ett arkiv för att bekräfta en bunt."
2119
2065
-#: bundle.c:257
2120
+#: bundle.c:264
2121
#, c-format
2122
msgid "The bundle contains this ref:"
2068
-msgid_plural "The bundle contains these %d refs:"
2123
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
2124
msgstr[0] "Bunten innehåller denna referens:"
2070
-msgstr[1] "Bunten innehåller dessa %d referenser:"
2125
+msgstr[1] "Bunten innehåller dessa %<PRIuMAX> referenser:"
2126
2072
-#: bundle.c:264
2127
+#: bundle.c:272
2128
msgid "The bundle records a complete history."
2129
msgstr "Bunten beskriver en komplett historik."
2130
2076
-#: bundle.c:266
2131
+#: bundle.c:274
2132
#, c-format
2133
msgid "The bundle requires this ref:"
2079
-msgid_plural "The bundle requires these %d refs:"
2134
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
2135
msgstr[0] "Bunten kräver denna referens:"
2081
-msgstr[1] "Bunten kräver dessa %d referenser:"
2136
+msgstr[1] "Bunten kräver dessa %<PRIuMAX> referenser:"
2137
2083
-#: bundle.c:333
2138
+#: bundle.c:350
2139
msgid "unable to dup bundle descriptor"
2140
msgstr "kan inte duplicera bunthandtag"
2141
2087
-#: bundle.c:340
2142
+#: bundle.c:357
2143
msgid "Could not spawn pack-objects"
2144
msgstr "Kunde inte starta pack-objects"
2145
2091
-#: bundle.c:351
2146
+#: bundle.c:368
2147
msgid "pack-objects died"
2148
msgstr "pack-objects misslyckades"
2149
2095
-#: bundle.c:400
2150
+#: bundle.c:417
2151
#, c-format
2152
msgid "ref '%s' is excluded by the rev-list options"
2153
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
2154
2100
-#: bundle.c:504
2155
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
2156
+#, c-format
2157
+msgid "unrecognized argument: %s"
2158
+msgstr "okänt argument: %s"
2159
+
2160
+#: bundle.c:548
2161
#, c-format
2162
msgid "unsupported bundle version %d"
2163
msgstr "version %d för bunt stöds ej"
2164
2105
-#: bundle.c:506
2165
+#: bundle.c:550
2166
#, c-format
2167
msgid "cannot write bundle version %d with algorithm %s"
2168
msgstr "kan inte skriva bunt med version %d med algoritmen %s"
2169
2110
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
2111
-#, c-format
2112
-msgid "unrecognized argument: %s"
2113
-msgstr "okänt argument: %s"
2114
-
2115
-#: bundle.c:553
2170
+#: bundle.c:600
2171
msgid "Refusing to create empty bundle."
2172
msgstr "Vägrar skapa en tom bunt."
2173
2119
-#: bundle.c:563
2174
+#: bundle.c:610
2175
#, c-format
2176
msgid "cannot create '%s'"
2177
msgstr "kan inte skapa \"%s\""
2178
2124
-#: bundle.c:588
2179
+#: bundle.c:639
2180
msgid "index-pack died"
2181
msgstr "index-pack dog"
2182
@@ -2149,7 +2204,7 @@ msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
2204
msgid "invalid color value: %.*s"
2205
msgstr "felaktigt färgvärde: %.*s"
2206
2152
-#: commit-graph.c:204 midx.c:51
2207
+#: commit-graph.c:204 midx.c:52
2208
msgid "invalid hash version"
2209
msgstr "felaktig hashnings-version"
2210
@@ -2177,207 +2232,208 @@ msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
2232
msgid "commit-graph file is too small to hold %u chunks"
2233
msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
2234
2180
-#: commit-graph.c:482
2235
+#: commit-graph.c:485
2236
msgid "commit-graph has no base graphs chunk"
2237
msgstr "incheckningsgrafen har inga bas-graf-stycken"
2238
2184
-#: commit-graph.c:492
2239
+#: commit-graph.c:495
2240
msgid "commit-graph chain does not match"
2241
msgstr "incheckningsgrafens kedja stämmer inte"
2242
2188
-#: commit-graph.c:540
2243
+#: commit-graph.c:543
2244
#, c-format
2245
msgid "invalid commit-graph chain: line '%s' not a hash"
2246
msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
2247
2193
-#: commit-graph.c:564
2248
+#: commit-graph.c:567
2249
msgid "unable to find all commit-graph files"
2250
msgstr "kan inte hitta alla incheckingsgraffiler"
2251
2197
-#: commit-graph.c:749 commit-graph.c:786
2252
+#: commit-graph.c:752 commit-graph.c:789
2253
msgid "invalid commit position. commit-graph is likely corrupt"
2254
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
2255
2201
-#: commit-graph.c:770
2256
+#: commit-graph.c:773
2257
#, c-format
2258
msgid "could not find commit %s"
2259
msgstr "kunde inte hitta incheckningen %s"
2260
2206
-#: commit-graph.c:803
2261
+#: commit-graph.c:806
2262
msgid "commit-graph requires overflow generation data but has none"
2263
msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
2264
2210
-#: commit-graph.c:1108 builtin/am.c:1369
2265
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2266
+#: builtin/clone.c:705
2267
#, c-format
2268
msgid "unable to parse commit %s"
2269
msgstr "kunde inte tolka incheckningen %s"
2270
2215
-#: commit-graph.c:1370 builtin/pack-objects.c:3070
2271
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
2272
#, c-format
2273
msgid "unable to get type of object %s"
2274
msgstr "kunde inte hämta typ för objektet %s"
2275
2220
-#: commit-graph.c:1401
2276
+#: commit-graph.c:1404
2277
msgid "Loading known commits in commit graph"
2278
msgstr "Läser in kända incheckningar i incheckningsgraf"
2279
2224
-#: commit-graph.c:1418
2280
+#: commit-graph.c:1421
2281
msgid "Expanding reachable commits in commit graph"
2282
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
2283
2228
-#: commit-graph.c:1438
2284
+#: commit-graph.c:1441
2285
msgid "Clearing commit marks in commit graph"
2286
msgstr "Rensar incheckningsmärken i incheckningsgraf"
2287
2232
-#: commit-graph.c:1457
2288
+#: commit-graph.c:1460
2289
msgid "Computing commit graph topological levels"
2290
msgstr "Beräknar topografiska nivåer för incheckningsgraf"
2291
2236
-#: commit-graph.c:1510
2292
+#: commit-graph.c:1513
2293
msgid "Computing commit graph generation numbers"
2294
msgstr "Beräknar generationsvärden för incheckningsgraf"
2295
2240
-#: commit-graph.c:1591
2296
+#: commit-graph.c:1598
2297
msgid "Computing commit changed paths Bloom filters"
2298
msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
2299
2244
-#: commit-graph.c:1668
2300
+#: commit-graph.c:1675
2301
msgid "Collecting referenced commits"
2302
msgstr "Samlar refererade incheckningar"
2303
2248
-#: commit-graph.c:1693
2304
+#: commit-graph.c:1701
2305
#, c-format
2250
-msgid "Finding commits for commit graph in %d pack"
2251
-msgid_plural "Finding commits for commit graph in %d packs"
2252
-msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
2253
-msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
2306
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2307
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2308
+msgstr[0] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
2309
+msgstr[1] "Söker incheckningar för incheckingsgraf i %<PRIuMAX> paket"
2310
2255
-#: commit-graph.c:1706
2311
+#: commit-graph.c:1714
2312
#, c-format
2313
msgid "error adding pack %s"
2314
msgstr "fel vid tillägg av paketet %s"
2315
2260
-#: commit-graph.c:1710
2316
+#: commit-graph.c:1718
2317
#, c-format
2318
msgid "error opening index for %s"
2319
msgstr "fel vid öppning av indexet för %s"
2320
2265
-#: commit-graph.c:1747
2321
+#: commit-graph.c:1756
2322
msgid "Finding commits for commit graph among packed objects"
2323
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
2324
2269
-#: commit-graph.c:1765
2325
+#: commit-graph.c:1774
2326
msgid "Finding extra edges in commit graph"
2327
msgstr "Söker ytterligare kanter i incheckingsgraf"
2328
2273
-#: commit-graph.c:1814
2329
+#: commit-graph.c:1823
2330
msgid "failed to write correct number of base graph ids"
2331
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
2332
2277
-#: commit-graph.c:1845 midx.c:1149
2333
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2334
#, c-format
2335
msgid "unable to create leading directories of %s"
2336
msgstr "kunde inte skapa inledande kataloger för %s"
2337
2282
-#: commit-graph.c:1858
2338
+#: commit-graph.c:1868
2339
msgid "unable to create temporary graph layer"
2340
msgstr "kan inte skapa temporärt graflager"
2341
2286
-#: commit-graph.c:1863
2342
+#: commit-graph.c:1873
2343
#, c-format
2344
msgid "unable to adjust shared permissions for '%s'"
2345
msgstr "kan inte justera delade behörigheter för \"%s\""
2346
2291
-#: commit-graph.c:1920
2347
+#: commit-graph.c:1930
2348
#, c-format
2349
msgid "Writing out commit graph in %d pass"
2350
msgid_plural "Writing out commit graph in %d passes"
2351
msgstr[0] "Skriver ut incheckningsgraf i %d pass"
2352
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
2353
2298
-#: commit-graph.c:1956
2354
+#: commit-graph.c:1967
2355
msgid "unable to open commit-graph chain file"
2356
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
2357
2302
-#: commit-graph.c:1972
2358
+#: commit-graph.c:1983
2359
msgid "failed to rename base commit-graph file"
2360
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
2361
2306
-#: commit-graph.c:1992
2362
+#: commit-graph.c:2004
2363
msgid "failed to rename temporary commit-graph file"
2364
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
2365
2310
-#: commit-graph.c:2125
2366
+#: commit-graph.c:2137
2367
msgid "Scanning merged commits"
2368
msgstr "Söker sammanslagna incheckningar"
2369
2314
-#: commit-graph.c:2169
2370
+#: commit-graph.c:2181
2371
msgid "Merging commit-graph"
2372
msgstr "Slår ihop incheckningsgraf"
2373
2318
-#: commit-graph.c:2277
2374
+#: commit-graph.c:2289
2375
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2376
msgstr ""
2377
"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
2378
2323
-#: commit-graph.c:2384
2379
+#: commit-graph.c:2396
2380
msgid "too many commits to write graph"
2381
msgstr "för många incheckningar för att skriva graf"
2382
2327
-#: commit-graph.c:2482
2383
+#: commit-graph.c:2494
2384
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2385
msgstr ""
2386
"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
2387
"trasig"
2388
2333
-#: commit-graph.c:2492
2389
+#: commit-graph.c:2504
2390
#, c-format
2391
msgid "commit-graph has incorrect OID order: %s then %s"
2392
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
2393
2338
-#: commit-graph.c:2502 commit-graph.c:2517
2394
+#: commit-graph.c:2514 commit-graph.c:2529
2395
#, c-format
2396
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2397
msgstr ""
2398
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
2399
2344
-#: commit-graph.c:2509
2400
+#: commit-graph.c:2521
2401
#, c-format
2402
msgid "failed to parse commit %s from commit-graph"
2403
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
2404
2349
-#: commit-graph.c:2527
2405
+#: commit-graph.c:2539
2406
msgid "Verifying commits in commit graph"
2407
msgstr "Bekräftar incheckningar i incheckningsgrafen"
2408
2353
-#: commit-graph.c:2542
2409
+#: commit-graph.c:2554
2410
#, c-format
2411
msgid "failed to parse commit %s from object database for commit-graph"
2412
msgstr ""
2413
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
2414
2359
-#: commit-graph.c:2549
2415
+#: commit-graph.c:2561
2416
#, c-format
2417
msgid "root tree OID for commit %s in commit-graph is %s != %s"
2418
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
2419
2364
-#: commit-graph.c:2559
2420
+#: commit-graph.c:2571
2421
#, c-format
2422
msgid "commit-graph parent list for commit %s is too long"
2423
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
2424
2369
-#: commit-graph.c:2568
2425
+#: commit-graph.c:2580
2426
#, c-format
2427
msgid "commit-graph parent for %s is %s != %s"
2428
msgstr "incheckningsgrafens förälder för %s är %s != %s"
2429
2374
-#: commit-graph.c:2582
2430
+#: commit-graph.c:2594
2431
#, c-format
2432
msgid "commit-graph parent list for commit %s terminates early"
2433
msgstr ""
2434
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
2435
2380
-#: commit-graph.c:2587
2436
+#: commit-graph.c:2599
2437
#, c-format
2438
msgid ""
2439
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2385,7 +2441,7 @@ msgstr ""
2441
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
2442
"noll på annan plats"
2443
2388
-#: commit-graph.c:2591
2444
+#: commit-graph.c:2603
2445
#, c-format
2446
msgid ""
2447
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2393,32 +2449,32 @@ msgstr ""
2449
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
2450
"%s, men noll på annan plats"
2451
2396
-#: commit-graph.c:2608
2452
+#: commit-graph.c:2620
2453
#, c-format
2454
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2455
msgstr ""
2456
"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
2457
"%<PRIuMAX>"
2458
2403
-#: commit-graph.c:2614
2459
+#: commit-graph.c:2626
2460
#, c-format
2461
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2462
msgstr ""
2463
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
2464
"= %<PRIuMAX>"
2465
2410
-#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
2411
-#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
2466
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2467
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2468
#, c-format
2469
msgid "could not parse %s"
2470
msgstr "kunde inte tolka %s"
2471
2416
-#: commit.c:55
2472
+#: commit.c:56
2473
#, c-format
2474
msgid "%s %s is not a commit!"
2475
msgstr "%s %s är inte en incheckning!"
2476
2421
-#: commit.c:196
2477
+#: commit.c:197
2478
msgid ""
2479
"Support for <GIT_DIR>/info/grafts is deprecated\n"
2480
"and will be removed in a future Git version.\n"
@@ -2438,29 +2494,29 @@ msgstr ""
2494
"Slå av detta meddelande genom att skriva\n"
2495
"\"git config advice.graftFileDeprecated false\""
2496
2441
-#: commit.c:1241
2497
+#: commit.c:1252
2498
#, c-format
2499
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2500
msgstr ""
2501
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
2502
2447
-#: commit.c:1245
2503
+#: commit.c:1256
2504
#, c-format
2505
msgid "Commit %s has a bad GPG signature allegedly by %s."
2506
msgstr ""
2507
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
2508
2453
-#: commit.c:1248
2509
+#: commit.c:1259
2510
#, c-format
2511
msgid "Commit %s does not have a GPG signature."
2512
msgstr "Incheckning %s har inte någon GPG-signatur."
2513
2458
-#: commit.c:1251
2514
+#: commit.c:1262
2515
#, c-format
2516
msgid "Commit %s has a good GPG signature by %s\n"
2517
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
2518
2463
-#: commit.c:1505
2519
+#: commit.c:1516
2520
msgid ""
2521
"Warning: commit message did not conform to UTF-8.\n"
2522
"You may want to amend it after fixing the message, or set the config\n"
@@ -2474,7 +2530,15 @@ msgstr ""
2530
msgid "memory exhausted"
2531
msgstr "minnet slut"
2532
2477
-#: config.c:125
2533
+#: compat/terminal.c:167
2534
+msgid "cannot resume in the background, please use 'fg' to resume"
2535
+msgstr "kan inte fortsätta i bakgrunden, använd \"fg\" för att återuppta"
2536
+
2537
+#: compat/terminal.c:168
2538
+msgid "cannot restore terminal settings"
2539
+msgstr "kan inte återställa terminalinställningar"
2540
+
2541
+#: config.c:143
2542
#, c-format
2543
msgid ""
2544
"exceeded maximum include depth (%d) while including\n"
@@ -2489,341 +2553,368 @@ msgstr ""
2553
"\t%s\n"
2554
"Det kan bero på cirkulära inkluderingar."
2555
2492
-#: config.c:141
2556
+#: config.c:159
2557
#, c-format
2558
msgid "could not expand include path '%s'"
2559
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
2560
2497
-#: config.c:152
2561
+#: config.c:170
2562
msgid "relative config includes must come from files"
2563
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
2564
2501
-#: config.c:201
2565
+#: config.c:219
2566
msgid "relative config include conditionals must come from files"
2567
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
2568
2505
-#: config.c:398
2569
+#: config.c:364
2570
+msgid ""
2571
+"remote URLs cannot be configured in file directly or indirectly included by "
2572
+"includeIf.hasconfig:remote.*.url"
2573
+msgstr ""
2574
+"fjärr-URL:er kan inte konfigureras direkt eller indirekt i en fil inkluderad "
2575
+"med includeIf.hasconfig:remote.*.url"
2576
+
2577
+#: config.c:508
2578
#, c-format
2579
msgid "invalid config format: %s"
2580
msgstr "felaktigt konfigurationsformat: %s"
2581
2510
-#: config.c:402
2582
+#: config.c:512
2583
#, c-format
2584
msgid "missing environment variable name for configuration '%.*s'"
2585
msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
2586
2515
-#: config.c:407
2587
+#: config.c:517
2588
#, c-format
2589
msgid "missing environment variable '%s' for configuration '%.*s'"
2590
msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
2591
2520
-#: config.c:443
2592
+#: config.c:553
2593
#, c-format
2594
msgid "key does not contain a section: %s"
2595
msgstr "nyckeln innehåller inte ett stycke: %s"
2596
2525
-#: config.c:448
2597
+#: config.c:558
2598
#, c-format
2599
msgid "key does not contain variable name: %s"
2600
msgstr "nyckeln innehåller inte variabelnamn: %s"
2601
2530
-#: config.c:470 sequencer.c:2806
2602
+#: config.c:580 sequencer.c:2802
2603
#, c-format
2604
msgid "invalid key: %s"
2605
msgstr "felaktig nyckel: %s"
2606
2535
-#: config.c:475
2607
+#: config.c:585
2608
#, c-format
2609
msgid "invalid key (newline): %s"
2610
msgstr "ogiltig nyckel (nyradstecken): %s"
2611
2540
-#: config.c:495
2612
+#: config.c:605
2613
msgid "empty config key"
2614
msgstr "tom konfigurationsnyckel"
2615
2544
-#: config.c:513 config.c:525
2616
+#: config.c:623 config.c:635
2617
#, c-format
2618
msgid "bogus config parameter: %s"
2619
msgstr "falsk konfigureringsparameter: %s"
2620
2549
-#: config.c:539 config.c:556 config.c:563 config.c:572
2621
+#: config.c:649 config.c:666 config.c:673 config.c:682
2622
#, c-format
2623
msgid "bogus format in %s"
2624
msgstr "felaktigt format i %s"
2625
2554
-#: config.c:606
2626
+#: config.c:716
2627
#, c-format
2628
msgid "bogus count in %s"
2629
msgstr "felaktigt antal i %s"
2630
2559
-#: config.c:610
2631
+#: config.c:720
2632
#, c-format
2633
msgid "too many entries in %s"
2634
msgstr "för många poster i %s"
2635
2564
-#: config.c:620
2636
+#: config.c:730
2637
#, c-format
2638
msgid "missing config key %s"
2639
msgstr "konfigurationsnyckel saknas för %s"
2640
2569
-#: config.c:628
2641
+#: config.c:738
2642
#, c-format
2643
msgid "missing config value %s"
2644
msgstr "konfigurationsvärde saknas för %s"
2645
2574
-#: config.c:979
2646
+#: config.c:1089
2647
#, c-format
2648
msgid "bad config line %d in blob %s"
2649
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
2650
2579
-#: config.c:983
2651
+#: config.c:1093
2652
#, c-format
2653
msgid "bad config line %d in file %s"
2654
msgstr "felaktig konfigurationsfil rad %d i filen %s"
2655
2584
-#: config.c:987
2656
+#: config.c:1097
2657
#, c-format
2658
msgid "bad config line %d in standard input"
2659
msgstr "felaktig konfigurationsfil rad %d i standard in"
2660
2589
-#: config.c:991
2661
+#: config.c:1101
2662
#, c-format
2663
msgid "bad config line %d in submodule-blob %s"
2664
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
2665
2594
-#: config.c:995
2666
+#: config.c:1105
2667
#, c-format
2668
msgid "bad config line %d in command line %s"
2669
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
2670
2599
-#: config.c:999
2671
+#: config.c:1109
2672
#, c-format
2673
msgid "bad config line %d in %s"
2674
msgstr "felaktig konfigurationsfil rad %d i %s"
2675
2604
-#: config.c:1136
2676
+#: config.c:1246
2677
msgid "out of range"
2678
msgstr "utanför intervallet"
2679
2608
-#: config.c:1136
2680
+#: config.c:1246
2681
msgid "invalid unit"
2682
msgstr "ogiltig enhet"
2683
2612
-#: config.c:1137
2684
+#: config.c:1247
2685
#, c-format
2686
msgid "bad numeric config value '%s' for '%s': %s"
2687
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
2688
2617
-#: config.c:1147
2689
+#: config.c:1257
2690
#, c-format
2691
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2692
msgstr ""
2693
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
2694
2623
-#: config.c:1150
2695
+#: config.c:1260
2696
#, c-format
2697
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2698
msgstr ""
2699
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
2700
2629
-#: config.c:1153
2701
+#: config.c:1263
2702
#, c-format
2703
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2704
msgstr ""
2705
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
2706
2635
-#: config.c:1156
2707
+#: config.c:1266
2708
#, c-format
2709
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2710
msgstr ""
2711
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
2712
"en %s: %s"
2713
2642
-#: config.c:1159
2714
+#: config.c:1269
2715
#, c-format
2716
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2717
msgstr ""
2718
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
2719
"%s: %s"
2720
2649
-#: config.c:1162
2721
+#: config.c:1272
2722
#, c-format
2723
msgid "bad numeric config value '%s' for '%s' in %s: %s"
2724
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
2725
2654
-#: config.c:1241
2726
+#: config.c:1368
2727
+#, c-format
2728
+msgid "invalid value for variable %s"
2729
+msgstr "ogiltigt värde för variabeln %s"
2730
+
2731
+#: config.c:1389
2732
+#, c-format
2733
+msgid "ignoring unknown core.fsync component '%s'"
2734
+msgstr "ignorerar okänd core.fsync-komponent \"%s\""
2735
+
2736
+#: config.c:1425
2737
#, c-format
2738
msgid "bad boolean config value '%s' for '%s'"
2739
msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
2740
2659
-#: config.c:1259
2741
+#: config.c:1443
2742
#, c-format
2743
msgid "failed to expand user dir in: '%s'"
2744
msgstr "misslyckades expandera användarkatalog i: \"%s\""
2745
2664
-#: config.c:1268
2746
+#: config.c:1452
2747
#, c-format
2748
msgid "'%s' for '%s' is not a valid timestamp"
2749
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
2750
2669
-#: config.c:1361
2751
+#: config.c:1545
2752
#, c-format
2753
msgid "abbrev length out of range: %d"
2754
msgstr "förkortningslängd utanför intervallet: %d"
2755
2674
-#: config.c:1375 config.c:1386
2756
+#: config.c:1559 config.c:1570
2757
#, c-format
2758
msgid "bad zlib compression level %d"
2759
msgstr "felaktigt zlib-komprimeringsgrad %d"
2760
2679
-#: config.c:1476
2761
+#: config.c:1660
2762
msgid "core.commentChar should only be one character"
2763
msgstr "core.commentChar kan bara vara ett tecken"
2764
2683
-#: config.c:1509
2765
+#: config.c:1692
2766
+#, c-format
2767
+msgid "ignoring unknown core.fsyncMethod value '%s'"
2768
+msgstr "ignorerar okänt core.fsyncMethod-värde \"%s\""
2769
+
2770
+#: config.c:1698
2771
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2772
+msgstr "core.fsyncObjectFiles avråds från; använd core.fsync istället"
2773
+
2774
+#: config.c:1714
2775
#, c-format
2776
msgid "invalid mode for object creation: %s"
2777
msgstr "felaktigt läge för skapande av objekt: %s"
2778
2688
-#: config.c:1584
2779
+#: config.c:1800
2780
#, c-format
2781
msgid "malformed value for %s"
2782
msgstr "felformat värde för %s"
2783
2693
-#: config.c:1610
2784
+#: config.c:1826
2785
#, c-format
2786
msgid "malformed value for %s: %s"
2787
msgstr "felformat värde för %s: %s"
2788
2698
-#: config.c:1611
2789
+#: config.c:1827
2790
msgid "must be one of nothing, matching, simple, upstream or current"
2791
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
2792
2702
-#: config.c:1672 builtin/pack-objects.c:4053
2793
+#: config.c:1888 builtin/pack-objects.c:4078
2794
#, c-format
2795
msgid "bad pack compression level %d"
2796
msgstr "felaktig paketkomprimeringsgrad %d"
2797
2707
-#: config.c:1795
2798
+#: config.c:2014
2799
#, c-format
2800
msgid "unable to load config blob object '%s'"
2801
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
2802
2712
-#: config.c:1798
2803
+#: config.c:2017
2804
#, c-format
2805
msgid "reference '%s' does not point to a blob"
2806
msgstr "referensen \"%s\" pekar inte på en blob"
2807
2717
-#: config.c:1816
2808
+#: config.c:2035
2809
#, c-format
2810
msgid "unable to resolve config blob '%s'"
2811
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
2812
2722
-#: config.c:1861
2813
+#: config.c:2080
2814
#, c-format
2815
msgid "failed to parse %s"
2816
msgstr "kunde inte tolka %s"
2817
2727
-#: config.c:1917
2818
+#: config.c:2136
2819
msgid "unable to parse command-line config"
2820
msgstr "kan inte tolka kommandoradskonfiguration"
2821
2731
-#: config.c:2285
2822
+#: config.c:2512
2823
msgid "unknown error occurred while reading the configuration files"
2824
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
2825
2735
-#: config.c:2459
2826
+#: config.c:2686
2827
#, c-format
2828
msgid "Invalid %s: '%s'"
2829
msgstr "Felaktigt %s: \"%s\""
2830
2740
-#: config.c:2504
2831
+#: config.c:2731
2832
#, c-format
2833
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2834
msgstr ""
2835
"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
2836
2746
-#: config.c:2550
2837
+#: config.c:2763
2838
#, c-format
2839
msgid "unable to parse '%s' from command-line config"
2840
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
2841
2751
-#: config.c:2552
2842
+#: config.c:2765
2843
#, c-format
2844
msgid "bad config variable '%s' in file '%s' at line %d"
2845
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
2846
2756
-#: config.c:2637
2847
+#: config.c:2850
2848
#, c-format
2849
msgid "invalid section name '%s'"
2850
msgstr "felaktigt sektionsnamn \"%s\""
2851
2761
-#: config.c:2669
2852
+#: config.c:2882
2853
#, c-format
2854
msgid "%s has multiple values"
2855
msgstr "%s har flera värden"
2856
2766
-#: config.c:2698
2857
+#: config.c:2911
2858
#, c-format
2859
msgid "failed to write new configuration file %s"
2860
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
2861
2771
-#: config.c:2950 config.c:3277
2862
+#: config.c:3177 config.c:3518
2863
#, c-format
2864
msgid "could not lock config file %s"
2865
msgstr "kunde inte låsa konfigurationsfilen %s"
2866
2776
-#: config.c:2961
2867
+#: config.c:3188
2868
#, c-format
2869
msgid "opening %s"
2870
msgstr "öppnar %s"
2871
2781
-#: config.c:2998 builtin/config.c:361
2872
+#: config.c:3225 builtin/config.c:361
2873
#, c-format
2874
msgid "invalid pattern: %s"
2875
msgstr "ogiltigt mönster: %s"
2876
2786
-#: config.c:3023
2877
+#: config.c:3250
2878
#, c-format
2879
msgid "invalid config file %s"
2880
msgstr "ogiltig konfigurationsfil: \"%s\""
2881
2791
-#: config.c:3036 config.c:3290
2882
+#: config.c:3263 config.c:3531
2883
#, c-format
2884
msgid "fstat on %s failed"
2885
msgstr "fstat misslyckades på %s"
2886
2796
-#: config.c:3047
2887
+#: config.c:3274
2888
#, c-format
2889
msgid "unable to mmap '%s'%s"
2890
msgstr "kunde inte utföra mmap på \"%s\"%s"
2891
2801
-#: config.c:3057 config.c:3295
2892
+#: config.c:3284 config.c:3536
2893
#, c-format
2894
msgid "chmod on %s failed"
2895
msgstr "chmod misslyckades på %s"
2896
2806
-#: config.c:3142 config.c:3392
2897
+#: config.c:3369 config.c:3633
2898
#, c-format
2899
msgid "could not write config file %s"
2900
msgstr "kunde inte skriva konfigurationsfilen %s"
2901
2811
-#: config.c:3176
2902
+#: config.c:3403
2903
#, c-format
2904
msgid "could not set '%s' to '%s'"
2905
msgstr "kunde inte ställa in \"%s\" till \"%s\""
2906
2816
-#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2907
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2908
#, c-format
2909
msgid "could not unset '%s'"
2910
msgstr "kunde inte ta bort inställning för \"%s\""
2911
2821
-#: config.c:3268
2912
+#: config.c:3509
2913
#, c-format
2914
msgid "invalid section name: %s"
2915
msgstr "felaktigt namn på stycke: %s"
2916
2826
-#: config.c:3435
2917
+#: config.c:3676
2918
#, c-format
2919
msgid "missing value for '%s'"
2920
msgstr "värde saknas för \"%s\""
@@ -3159,68 +3250,68 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"
3250
msgid "refusing to work with credential missing protocol field"
3251
msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
3252
3162
-#: credential.c:395
3253
+#: credential.c:396
3254
#, c-format
3255
msgid "url contains a newline in its %s component: %s"
3256
msgstr "url innehåller radbrytning i komponenten %s: %s"
3257
3167
-#: credential.c:439
3258
+#: credential.c:440
3259
#, c-format
3260
msgid "url has no scheme: %s"
3261
msgstr "url saknar protokoll: %s"
3262
3172
-#: credential.c:512
3263
+#: credential.c:513
3264
#, c-format
3265
msgid "credential url cannot be parsed: %s"
3266
msgstr "kan inte tolka url för inloggingsuppgifter: %s"
3267
3177
-#: date.c:138
3268
+#: date.c:139
3269
msgid "in the future"
3270
msgstr "i framtiden"
3271
3181
-#: date.c:144
3272
+#: date.c:145
3273
#, c-format
3274
msgid "%<PRIuMAX> second ago"
3275
msgid_plural "%<PRIuMAX> seconds ago"
3276
msgstr[0] "%<PRIuMAX> sekund sedan"
3277
msgstr[1] "%<PRIuMAX> sekunder sedan"
3278
3188
-#: date.c:151
3279
+#: date.c:152
3280
#, c-format
3281
msgid "%<PRIuMAX> minute ago"
3282
msgid_plural "%<PRIuMAX> minutes ago"
3283
msgstr[0] "%<PRIuMAX> minut sedan"
3284
msgstr[1] "%<PRIuMAX> minuter sedan"
3285
3195
-#: date.c:158
3286
+#: date.c:159
3287
#, c-format
3288
msgid "%<PRIuMAX> hour ago"
3289
msgid_plural "%<PRIuMAX> hours ago"
3290
msgstr[0] "%<PRIuMAX> timme sedan"
3291
msgstr[1] "%<PRIuMAX> timmar sedan"
3292
3202
-#: date.c:165
3293
+#: date.c:166
3294
#, c-format
3295
msgid "%<PRIuMAX> day ago"
3296
msgid_plural "%<PRIuMAX> days ago"
3297
msgstr[0] "%<PRIuMAX> dag sedan"
3298
msgstr[1] "%<PRIuMAX> dagar sedan"
3299
3209
-#: date.c:171
3300
+#: date.c:172
3301
#, c-format
3302
msgid "%<PRIuMAX> week ago"
3303
msgid_plural "%<PRIuMAX> weeks ago"
3304
msgstr[0] "%<PRIuMAX> vecka sedan"
3305
msgstr[1] "%<PRIuMAX> veckor sedan"
3306
3216
-#: date.c:178
3307
+#: date.c:179
3308
#, c-format
3309
msgid "%<PRIuMAX> month ago"
3310
msgid_plural "%<PRIuMAX> months ago"
3311
msgstr[0] "%<PRIuMAX> månad sedan"
3312
msgstr[1] "%<PRIuMAX> månader sedan"
3313
3223
-#: date.c:189
3314
+#: date.c:190
3315
#, c-format
3316
msgid "%<PRIuMAX> year"
3317
msgid_plural "%<PRIuMAX> years"
@@ -3228,14 +3319,14 @@ msgstr[0] "%<PRIuMAX> år"
3319
msgstr[1] "%<PRIuMAX> år"
3320
3321
#. TRANSLATORS: "%s" is "<n> years"
3231
-#: date.c:192
3322
+#: date.c:193
3323
#, c-format
3324
msgid "%s, %<PRIuMAX> month ago"
3325
msgid_plural "%s, %<PRIuMAX> months ago"
3326
msgstr[0] "%s, %<PRIuMAX> månad sedan"
3327
msgstr[1] "%s, %<PRIuMAX> månader sedan"
3328
3238
-#: date.c:197 date.c:202
3329
+#: date.c:198 date.c:203
3330
#, c-format
3331
msgid "%<PRIuMAX> year ago"
3332
msgid_plural "%<PRIuMAX> years ago"
@@ -3266,10 +3357,14 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
3357
msgid "Marked %d islands, done.\n"
3358
msgstr "Markerade %d öar, klar.\n"
3359
3269
-#: diff-merges.c:70
3360
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3361
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
3362
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3363
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3364
+#: builtin/pull.c:47 builtin/pull.c:321
3365
#, c-format
3271
-msgid "unknown value for --diff-merges: %s"
3272
-msgstr "okänt värde för --diff-merges: %s"
3366
+msgid "invalid value for '%s': '%s'"
3367
+msgstr "felaktigt värde för \"%s\": \"%s\""
3368
3369
#: diff-lib.c:561
3370
msgid "--merge-base does not work with ranges"
@@ -3303,17 +3398,17 @@ msgstr ""
3398
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
3399
"en arbetskatalog."
3400
3306
-#: diff.c:158
3401
+#: diff.c:159
3402
#, c-format
3403
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3404
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
3405
3311
-#: diff.c:163
3406
+#: diff.c:164
3407
#, c-format
3408
msgid " Unknown dirstat parameter '%s'\n"
3409
msgstr " Okänd dirstat-parameter \"%s\"\n"
3410
3316
-#: diff.c:299
3411
+#: diff.c:300
3412
msgid ""
3413
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3414
"'dimmed-zebra', 'plain'"
@@ -3321,7 +3416,7 @@ msgstr ""
3416
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
3417
"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
3418
3324
-#: diff.c:327
3419
+#: diff.c:328
3420
#, c-format
3421
msgid ""
3422
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3331,7 +3426,7 @@ msgstr ""
3426
"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
3427
"\""
3428
3334
-#: diff.c:335
3429
+#: diff.c:336
3430
msgid ""
3431
"color-moved-ws: allow-indentation-change cannot be combined with other "
3432
"whitespace modes"
@@ -3339,12 +3434,12 @@ msgstr ""
3434
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
3435
"blankstegslägen"
3436
3342
-#: diff.c:412
3437
+#: diff.c:413
3438
#, c-format
3439
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3440
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
3441
3347
-#: diff.c:472
3442
+#: diff.c:473
3443
#, c-format
3444
msgid ""
3445
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3353,30 +3448,30 @@ msgstr ""
3448
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
3449
"%s"
3450
3356
-#: diff.c:4237
3451
+#: diff.c:4282
3452
#, c-format
3453
msgid "external diff died, stopping at %s"
3454
msgstr "extern diff dog, stannar vid %s"
3455
3361
-#: diff.c:4589
3456
+#: diff.c:4677 parse-options.c:1114
3457
#, c-format
3458
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3459
msgstr ""
3460
"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
3461
3367
-#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3462
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3463
#, c-format
3464
msgid "options '%s', '%s', and '%s' cannot be used together"
3465
msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
3466
3372
-#: diff.c:4597
3467
+#: diff.c:4685
3468
#, c-format
3469
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3470
msgstr ""
3471
"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
3472
"\"%s\""
3473
3379
-#: diff.c:4601
3474
+#: diff.c:4689
3475
#, c-format
3476
msgid ""
3477
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
@@ -3384,22 +3479,22 @@ msgstr ""
3479
"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
3480
"\"%s\" och \"%s\""
3481
3387
-#: diff.c:4681
3482
+#: diff.c:4769
3483
msgid "--follow requires exactly one pathspec"
3484
msgstr "--follow kräver exakt en sökvägsangivelse"
3485
3391
-#: diff.c:4729
3486
+#: diff.c:4823
3487
#, c-format
3488
msgid "invalid --stat value: %s"
3489
msgstr "ogiltigt värde för --stat: %s"
3490
3396
-#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
3491
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3492
#: parse-options.c:217 parse-options.c:221
3493
#, c-format
3494
msgid "%s expects a numerical value"
3495
msgstr "%s förväntar ett numeriskt värde"
3496
3402
-#: diff.c:4766
3497
+#: diff.c:4860
3498
#, c-format
3499
msgid ""
3500
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3408,42 +3503,42 @@ msgstr ""
3503
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
3504
"%s"
3505
3411
-#: diff.c:4851
3506
+#: diff.c:4893
3507
#, c-format
3508
msgid "unknown change class '%c' in --diff-filter=%s"
3509
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
3510
3416
-#: diff.c:4875
3511
+#: diff.c:4917
3512
#, c-format
3513
msgid "unknown value after ws-error-highlight=%.*s"
3514
msgstr "okänt värde efter ws-error-highlight=%.*s"
3515
3421
-#: diff.c:4889
3516
+#: diff.c:4931
3517
#, c-format
3518
msgid "unable to resolve '%s'"
3519
msgstr "kunde inte slå upp \"%s\""
3520
3426
-#: diff.c:4939 diff.c:4945
3521
+#: diff.c:4981 diff.c:4987
3522
#, c-format
3523
msgid "%s expects <n>/<m> form"
3524
msgstr "%s förväntar formen <n>/<m>"
3525
3431
-#: diff.c:4957
3526
+#: diff.c:4999
3527
#, c-format
3528
msgid "%s expects a character, got '%s'"
3529
msgstr "%s förväntar ett tecken, fick \"%s\""
3530
3436
-#: diff.c:4978
3531
+#: diff.c:5020
3532
#, c-format
3533
msgid "bad --color-moved argument: %s"
3534
msgstr "felaktigt argument till --color-moved: %s"
3535
3441
-#: diff.c:4997
3536
+#: diff.c:5039
3537
#, c-format
3538
msgid "invalid mode '%s' in --color-moved-ws"
3539
msgstr "ogiltigt läge %s\" i --color-moved-ws"
3540
3446
-#: diff.c:5037
3541
+#: diff.c:5079
3542
msgid ""
3543
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3544
"\"histogram\""
@@ -3451,154 +3546,154 @@ msgstr ""
3546
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
3547
"\"histogram\""
3548
3454
-#: diff.c:5073 diff.c:5093
3549
+#: diff.c:5115 diff.c:5135
3550
#, c-format
3551
msgid "invalid argument to %s"
3552
msgstr "ogiltigt argument för %s"
3553
3459
-#: diff.c:5197
3554
+#: diff.c:5239
3555
#, c-format
3556
msgid "invalid regex given to -I: '%s'"
3557
msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
3558
3464
-#: diff.c:5246
3559
+#: diff.c:5288
3560
#, c-format
3561
msgid "failed to parse --submodule option parameter: '%s'"
3562
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
3563
3469
-#: diff.c:5302
3564
+#: diff.c:5344
3565
#, c-format
3566
msgid "bad --word-diff argument: %s"
3567
msgstr "felaktigt argument --word-diff: %s"
3568
3474
-#: diff.c:5338
3569
+#: diff.c:5380
3570
msgid "Diff output format options"
3571
msgstr "Formatflaggor för diff-utdata"
3572
3478
-#: diff.c:5340 diff.c:5346
3573
+#: diff.c:5382 diff.c:5388
3574
msgid "generate patch"
3575
msgstr "skapar patch"
3576
3482
-#: diff.c:5343 builtin/log.c:179
3577
+#: diff.c:5385 builtin/log.c:180
3578
msgid "suppress diff output"
3579
msgstr "undertryck diff-utdata"
3580
3486
-#: diff.c:5348 diff.c:5462 diff.c:5469
3581
+#: diff.c:5390 diff.c:5504 diff.c:5511
3582
msgid "<n>"
3583
msgstr "<n>"
3584
3490
-#: diff.c:5349 diff.c:5352
3585
+#: diff.c:5391 diff.c:5394
3586
msgid "generate diffs with <n> lines context"
3587
msgstr "skapa diffar med <n> rader sammanhang"
3588
3494
-#: diff.c:5354
3589
+#: diff.c:5396
3590
msgid "generate the diff in raw format"
3591
msgstr "generera diff i råformat"
3592
3498
-#: diff.c:5357
3593
+#: diff.c:5399
3594
msgid "synonym for '-p --raw'"
3595
msgstr "synonym till \"-p --raw\""
3596
3502
-#: diff.c:5361
3597
+#: diff.c:5403
3598
msgid "synonym for '-p --stat'"
3599
msgstr "synonym till \"-p --stat\""
3600
3506
-#: diff.c:5365
3601
+#: diff.c:5407
3602
msgid "machine friendly --stat"
3603
msgstr "maskinläsbar --stat"
3604
3510
-#: diff.c:5368
3605
+#: diff.c:5410
3606
msgid "output only the last line of --stat"
3607
msgstr "skriv bara ut den sista raden för --stat"
3608
3514
-#: diff.c:5370 diff.c:5378
3609
+#: diff.c:5412 diff.c:5420
3610
msgid "<param1,param2>..."
3611
msgstr "<param1,param2>..."
3612
3518
-#: diff.c:5371
3613
+#: diff.c:5413
3614
msgid ""
3615
"output the distribution of relative amount of changes for each sub-directory"
3616
msgstr ""
3617
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
3618
3524
-#: diff.c:5375
3619
+#: diff.c:5417
3620
msgid "synonym for --dirstat=cumulative"
3621
msgstr "synonym för --dirstat=cumulative"
3622
3528
-#: diff.c:5379
3623
+#: diff.c:5421
3624
msgid "synonym for --dirstat=files,param1,param2..."
3625
msgstr "synonym för --dirstat=filer,param1,param2..."
3626
3532
-#: diff.c:5383
3627
+#: diff.c:5425
3628
msgid "warn if changes introduce conflict markers or whitespace errors"
3629
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
3630
3536
-#: diff.c:5386
3631
+#: diff.c:5428
3632
msgid "condensed summary such as creations, renames and mode changes"
3633
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
3634
3540
-#: diff.c:5389
3635
+#: diff.c:5431
3636
msgid "show only names of changed files"
3637
msgstr "visa endast namnen på ändrade filer"
3638
3544
-#: diff.c:5392
3639
+#: diff.c:5434
3640
msgid "show only names and status of changed files"
3641
msgstr "visa endast namn och status för ändrade filer"
3642
3548
-#: diff.c:5394
3643
+#: diff.c:5436
3644
msgid "<width>[,<name-width>[,<count>]]"
3645
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
3646
3552
-#: diff.c:5395
3647
+#: diff.c:5437
3648
msgid "generate diffstat"
3649
msgstr "skapa diffstat"
3650
3556
-#: diff.c:5397 diff.c:5400 diff.c:5403
3651
+#: diff.c:5439 diff.c:5442 diff.c:5445
3652
msgid "<width>"
3653
msgstr "<bredd>"
3654
3560
-#: diff.c:5398
3655
+#: diff.c:5440
3656
msgid "generate diffstat with a given width"
3657
msgstr "generera en diffstat med given bredd"
3658
3564
-#: diff.c:5401
3659
+#: diff.c:5443
3660
msgid "generate diffstat with a given name width"
3661
msgstr "generera en diffstat med given namnbredd"
3662
3568
-#: diff.c:5404
3663
+#: diff.c:5446
3664
msgid "generate diffstat with a given graph width"
3665
msgstr "generera en diffstat med given grafbredd"
3666
3572
-#: diff.c:5406
3667
+#: diff.c:5448
3668
msgid "<count>"
3669
msgstr "<antal>"
3670
3576
-#: diff.c:5407
3671
+#: diff.c:5449
3672
msgid "generate diffstat with limited lines"
3673
msgstr "generera diffstat med begränsade rader"
3674
3580
-#: diff.c:5410
3675
+#: diff.c:5452
3676
msgid "generate compact summary in diffstat"
3677
msgstr "skapa kompakt översikt i diffstat"
3678
3584
-#: diff.c:5413
3679
+#: diff.c:5455
3680
msgid "output a binary diff that can be applied"
3681
msgstr "skapa en binärdiff som kan appliceras"
3682
3588
-#: diff.c:5416
3683
+#: diff.c:5458
3684
msgid "show full pre- and post-image object names on the \"index\" lines"
3685
msgstr ""
3686
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
3687
3593
-#: diff.c:5418
3688
+#: diff.c:5460
3689
msgid "show colored diff"
3690
msgstr "visa färgad diff"
3691
3597
-#: diff.c:5419
3692
+#: diff.c:5461
3693
msgid "<kind>"
3694
msgstr "<typ>"
3695
3601
-#: diff.c:5420
3696
+#: diff.c:5462
3697
msgid ""
3698
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3699
"diff"
@@ -3606,7 +3701,7 @@ msgstr ""
3701
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
3702
"\"new\" (nya) rader i diffen"
3703
3609
-#: diff.c:5423
3704
+#: diff.c:5465
3705
msgid ""
3706
"do not munge pathnames and use NULs as output field terminators in --raw or "
3707
"--numstat"
@@ -3614,87 +3709,87 @@ msgstr ""
3709
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
3710
"eller --numstat"
3711
3617
-#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
3712
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3713
msgid "<prefix>"
3714
msgstr "<prefix>"
3715
3621
-#: diff.c:5427
3716
+#: diff.c:5469
3717
msgid "show the given source prefix instead of \"a/\""
3718
msgstr "visa givet källprefix istället för \"a/\""
3719
3625
-#: diff.c:5430
3720
+#: diff.c:5472
3721
msgid "show the given destination prefix instead of \"b/\""
3722
msgstr "visa givet målprefix istället för \"b/\""
3723
3629
-#: diff.c:5433
3724
+#: diff.c:5475
3725
msgid "prepend an additional prefix to every line of output"
3726
msgstr "lägg till ytterligare prefix på alla rader i utdata"
3727
3633
-#: diff.c:5436
3728
+#: diff.c:5478
3729
msgid "do not show any source or destination prefix"
3730
msgstr "visa inte käll- eller målprefix"
3731
3637
-#: diff.c:5439
3732
+#: diff.c:5481
3733
msgid "show context between diff hunks up to the specified number of lines"
3734
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
3735
3641
-#: diff.c:5443 diff.c:5448 diff.c:5453
3736
+#: diff.c:5485 diff.c:5490 diff.c:5495
3737
msgid "<char>"
3738
msgstr "<tecken>"
3739
3645
-#: diff.c:5444
3740
+#: diff.c:5486
3741
msgid "specify the character to indicate a new line instead of '+'"
3742
msgstr "ange tecken för att ange ny rad istället för \"+\""
3743
3649
-#: diff.c:5449
3744
+#: diff.c:5491
3745
msgid "specify the character to indicate an old line instead of '-'"
3746
msgstr "ange tecken för att ange gammal rad istället för \"-\""
3747
3653
-#: diff.c:5454
3748
+#: diff.c:5496
3749
msgid "specify the character to indicate a context instead of ' '"
3750
msgstr "ange tecken för att ange sammanhang istället för \" \""
3751
3657
-#: diff.c:5457
3752
+#: diff.c:5499
3753
msgid "Diff rename options"
3754
msgstr "Diff-namnbytesflaggor"
3755
3661
-#: diff.c:5458
3756
+#: diff.c:5500
3757
msgid "<n>[/<m>]"
3758
msgstr "<n>[/<m>]"
3759
3665
-#: diff.c:5459
3760
+#: diff.c:5501
3761
msgid "break complete rewrite changes into pairs of delete and create"
3762
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
3763
3669
-#: diff.c:5463
3764
+#: diff.c:5505
3765
msgid "detect renames"
3766
msgstr "detektera namnändringar"
3767
3673
-#: diff.c:5467
3768
+#: diff.c:5509
3769
msgid "omit the preimage for deletes"
3770
msgstr "ta bort för-version för borttagningar"
3771
3677
-#: diff.c:5470
3772
+#: diff.c:5512
3773
msgid "detect copies"
3774
msgstr "detektera kopior"
3775
3681
-#: diff.c:5474
3776
+#: diff.c:5516
3777
msgid "use unmodified files as source to find copies"
3778
msgstr "använd oförändrade som källa för att hitta kopior"
3779
3685
-#: diff.c:5476
3780
+#: diff.c:5518
3781
msgid "disable rename detection"
3782
msgstr "inaktivera detektering av namnbyten"
3783
3689
-#: diff.c:5479
3784
+#: diff.c:5521
3785
msgid "use empty blobs as rename source"
3786
msgstr "använd tomma blob:ar som namnändringskälla"
3787
3693
-#: diff.c:5481
3788
+#: diff.c:5523
3789
msgid "continue listing the history of a file beyond renames"
3790
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
3791
3697
-#: diff.c:5484
3792
+#: diff.c:5526
3793
msgid ""
3794
"prevent rename/copy detection if the number of rename/copy targets exceeds "
3795
"given limit"
@@ -3702,163 +3797,163 @@ msgstr ""
3797
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
3798
"given gräns"
3799
3705
-#: diff.c:5486
3800
+#: diff.c:5528
3801
msgid "Diff algorithm options"
3802
msgstr "Alternativ för diff-algoritm"
3803
3709
-#: diff.c:5488
3804
+#: diff.c:5530
3805
msgid "produce the smallest possible diff"
3806
msgstr "skapa minsta möjliga diff"
3807
3713
-#: diff.c:5491
3808
+#: diff.c:5533
3809
msgid "ignore whitespace when comparing lines"
3810
msgstr "ignorera blanktecken vid radjämförelse"
3811
3717
-#: diff.c:5494
3812
+#: diff.c:5536
3813
msgid "ignore changes in amount of whitespace"
3814
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
3815
3721
-#: diff.c:5497
3816
+#: diff.c:5539
3817
msgid "ignore changes in whitespace at EOL"
3818
msgstr "ignorera blanktecken vid radslut"
3819
3725
-#: diff.c:5500
3820
+#: diff.c:5542
3821
msgid "ignore carrier-return at the end of line"
3822
msgstr "ignorera CR-tecken vid radslut"
3823
3729
-#: diff.c:5503
3824
+#: diff.c:5545
3825
msgid "ignore changes whose lines are all blank"
3826
msgstr "ignorera ändringar i rader som är helt blanka"
3827
3733
-#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
3828
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
3829
msgid "<regex>"
3830
msgstr "<reguttr>"
3831
3737
-#: diff.c:5506
3832
+#: diff.c:5548
3833
msgid "ignore changes whose all lines match <regex>"
3834
msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
3835
3741
-#: diff.c:5509
3836
+#: diff.c:5551
3837
msgid "heuristic to shift diff hunk boundaries for easy reading"
3838
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
3839
3745
-#: diff.c:5512
3840
+#: diff.c:5554
3841
msgid "generate diff using the \"patience diff\" algorithm"
3842
msgstr "skapa diffar med algoritmen \"patience diff\""
3843
3749
-#: diff.c:5516
3844
+#: diff.c:5558
3845
msgid "generate diff using the \"histogram diff\" algorithm"
3846
msgstr "skapa diffar med algoritmen \"histogram diff\""
3847
3753
-#: diff.c:5518
3848
+#: diff.c:5560
3849
msgid "<algorithm>"
3850
msgstr "<algoritm>"
3851
3757
-#: diff.c:5519
3852
+#: diff.c:5561
3853
msgid "choose a diff algorithm"
3854
msgstr "välj en diff-algoritm"
3855
3761
-#: diff.c:5521
3856
+#: diff.c:5563
3857
msgid "<text>"
3858
msgstr "<text>"
3859
3765
-#: diff.c:5522
3860
+#: diff.c:5564
3861
msgid "generate diff using the \"anchored diff\" algorithm"
3862
msgstr "skapa diffar med algoritmen \"anchored diff\""
3863
3769
-#: diff.c:5524 diff.c:5533 diff.c:5536
3864
+#: diff.c:5566 diff.c:5575 diff.c:5578
3865
msgid "<mode>"
3866
msgstr "<läge>"
3867
3773
-#: diff.c:5525
3868
+#: diff.c:5567
3869
msgid "show word diff, using <mode> to delimit changed words"
3870
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
3871
3777
-#: diff.c:5528
3872
+#: diff.c:5570
3873
msgid "use <regex> to decide what a word is"
3874
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
3875
3781
-#: diff.c:5531
3876
+#: diff.c:5573
3877
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3878
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
3879
3785
-#: diff.c:5534
3880
+#: diff.c:5576
3881
msgid "moved lines of code are colored differently"
3882
msgstr "flyttade kodrader färgas på annat sätt"
3883
3789
-#: diff.c:5537
3884
+#: diff.c:5579
3885
msgid "how white spaces are ignored in --color-moved"
3886
msgstr "hur blanktecken ignoreras i --color-moved"
3887
3793
-#: diff.c:5540
3888
+#: diff.c:5582
3889
msgid "Other diff options"
3890
msgstr "Andra diff-flaggor"
3891
3797
-#: diff.c:5542
3892
+#: diff.c:5584
3893
msgid "when run from subdir, exclude changes outside and show relative paths"
3894
msgstr ""
3895
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
3896
"sökvägar"
3897
3803
-#: diff.c:5546
3898
+#: diff.c:5588
3899
msgid "treat all files as text"
3900
msgstr "hantera alla filer som text"
3901
3807
-#: diff.c:5548
3902
+#: diff.c:5590
3903
msgid "swap two inputs, reverse the diff"
3904
msgstr "växla två indatafiler, vänd diffen"
3905
3811
-#: diff.c:5550
3906
+#: diff.c:5592
3907
msgid "exit with 1 if there were differences, 0 otherwise"
3908
msgstr "avsluta med 1 vid ändringar, annars 0"
3909
3815
-#: diff.c:5552
3910
+#: diff.c:5594
3911
msgid "disable all output of the program"
3912
msgstr "slå av alla utdata från programmet"
3913
3819
-#: diff.c:5554
3914
+#: diff.c:5596
3915
msgid "allow an external diff helper to be executed"
3916
msgstr "tillåt köra en extern diff-hjälpare"
3917
3823
-#: diff.c:5556
3918
+#: diff.c:5598
3919
msgid "run external text conversion filters when comparing binary files"
3920
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
3921
3827
-#: diff.c:5558
3922
+#: diff.c:5600
3923
msgid "<when>"
3924
msgstr "<när>"
3925
3831
-#: diff.c:5559
3926
+#: diff.c:5601
3927
msgid "ignore changes to submodules in the diff generation"
3928
msgstr "ignorera ändringar i undermoduler när diffen skapas"
3929
3835
-#: diff.c:5562
3930
+#: diff.c:5604
3931
msgid "<format>"
3932
msgstr "<format>"
3933
3839
-#: diff.c:5563
3934
+#: diff.c:5605
3935
msgid "specify how differences in submodules are shown"
3936
msgstr "ange hur ändringar i undermoduler visas"
3937
3843
-#: diff.c:5567
3938
+#: diff.c:5609
3939
msgid "hide 'git add -N' entries from the index"
3940
msgstr "dölj \"git add -N\"-poster från indexet"
3941
3847
-#: diff.c:5570
3942
+#: diff.c:5612
3943
msgid "treat 'git add -N' entries as real in the index"
3944
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
3945
3851
-#: diff.c:5572
3946
+#: diff.c:5614
3947
msgid "<string>"
3948
msgstr "<sträng>"
3949
3855
-#: diff.c:5573
3950
+#: diff.c:5615
3951
msgid ""
3952
"look for differences that change the number of occurrences of the specified "
3953
"string"
3954
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
3955
3861
-#: diff.c:5576
3956
+#: diff.c:5618
3957
msgid ""
3958
"look for differences that change the number of occurrences of the specified "
3959
"regex"
@@ -3866,66 +3961,66 @@ msgstr ""
3961
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
3962
"uttryck"
3963
3869
-#: diff.c:5579
3964
+#: diff.c:5621
3965
msgid "show all changes in the changeset with -S or -G"
3966
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
3967
3873
-#: diff.c:5582
3968
+#: diff.c:5624
3969
msgid "treat <string> in -S as extended POSIX regular expression"
3970
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
3971
3877
-#: diff.c:5585
3972
+#: diff.c:5627
3973
msgid "control the order in which files appear in the output"
3974
msgstr "styr ordningen i vilken filer visas i utdata"
3975
3881
-#: diff.c:5586 diff.c:5589
3976
+#: diff.c:5628 diff.c:5631
3977
msgid "<path>"
3978
msgstr "<sökväg>"
3979
3885
-#: diff.c:5587
3980
+#: diff.c:5629
3981
msgid "show the change in the specified path first"
3982
msgstr "visa ändringen i angiven sökväg först"
3983
3889
-#: diff.c:5590
3984
+#: diff.c:5632
3985
msgid "skip the output to the specified path"
3986
msgstr "hoppa över utdata fram till angiven sökväg"
3987
3893
-#: diff.c:5592
3988
+#: diff.c:5634
3989
msgid "<object-id>"
3990
msgstr "<objekt-id>"
3991
3897
-#: diff.c:5593
3992
+#: diff.c:5635
3993
msgid ""
3994
"look for differences that change the number of occurrences of the specified "
3995
"object"
3996
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
3997
3903
-#: diff.c:5595
3998
+#: diff.c:5637
3999
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
4000
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
4001
3907
-#: diff.c:5596
4002
+#: diff.c:5638
4003
msgid "select files by diff type"
4004
msgstr "välj filter efter diff-typ"
4005
3911
-#: diff.c:5598
4006
+#: diff.c:5640
4007
msgid "<file>"
4008
msgstr "<fil>"
4009
3915
-#: diff.c:5599
3916
-msgid "Output to a specific file"
3917
-msgstr "Skriv utdata till en specifik fil"
4010
+#: diff.c:5641
4011
+msgid "output to a specific file"
4012
+msgstr "skriv utdata till en specifik fil"
4013
3919
-#: diff.c:6257
4014
+#: diff.c:6321
4015
msgid "exhaustive rename detection was skipped due to too many files."
4016
msgstr ""
4017
"uttömmande namnbytesdetektering hoppades över på grund av för många filer."
4018
3924
-#: diff.c:6260
4019
+#: diff.c:6324
4020
msgid "only found copies from modified paths due to too many files."
4021
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
4022
3928
-#: diff.c:6263
4023
+#: diff.c:6327
4024
#, c-format
4025
msgid ""
4026
"you may want to set your %s variable to at least %d and retry the command."
@@ -3977,20 +4072,20 @@ msgstr "inaktiverar konmönstermatchning"
4072
msgid "cannot use %s as an exclude file"
4073
msgstr "kan inte använda %s som exkluderingsfil"
4074
3980
-#: dir.c:2418
4075
+#: dir.c:2419
4076
#, c-format
4077
msgid "could not open directory '%s'"
4078
msgstr "kunde inte öppna katalogen \"%s\""
4079
3985
-#: dir.c:2720
4080
+#: dir.c:2721
4081
msgid "failed to get kernel name and information"
4082
msgstr "misslyckades hämta kärnans namn och information"
4083
3989
-#: dir.c:2844
4084
+#: dir.c:2846
4085
msgid "untracked cache is disabled on this system or location"
4086
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
4087
3993
-#: dir.c:3112
4088
+#: dir.c:3119
4089
msgid ""
4090
"No directory name could be guessed.\n"
4091
"Please specify a directory on the command line"
@@ -3998,17 +4093,17 @@ msgstr ""
4093
"Kunde inte gissa katalognamn.\n"
4094
"Ange en katalog på kommandoraden"
4095
4001
-#: dir.c:3800
4096
+#: dir.c:3807
4097
#, c-format
4098
msgid "index file corrupt in repo %s"
4099
msgstr "indexfilen trasig i arkivet %s"
4100
4006
-#: dir.c:3847 dir.c:3852
4101
+#: dir.c:3854 dir.c:3859
4102
#, c-format
4103
msgid "could not create directories for %s"
4104
msgstr "kunde inte skapa kataloger för %s"
4105
4011
-#: dir.c:3881
4106
+#: dir.c:3888
4107
#, c-format
4108
msgid "could not migrate git directory from '%s' to '%s'"
4109
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -4027,7 +4122,7 @@ msgstr "Filtrerar innehåll"
4122
msgid "could not stat file '%s'"
4123
msgstr "kunde inte ta status på filen \"%s\""
4124
4030
-#: environment.c:145
4125
+#: environment.c:147
4126
#, c-format
4127
msgid "bad git namespace path \"%s\""
4128
msgstr "felaktig git-namnrymdssökväg \"%s\""
@@ -4058,248 +4153,275 @@ msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
4153
msgid "unable to write to remote"
4154
msgstr "kunde inte skriva till fjärren"
4155
4061
-#: fetch-pack.c:395 fetch-pack.c:1439
4156
+#: fetch-pack.c:397 fetch-pack.c:1460
4157
#, c-format
4158
msgid "invalid shallow line: %s"
4159
msgstr "ogiltig \"shallow\"-rad: %s"
4160
4066
-#: fetch-pack.c:401 fetch-pack.c:1445
4161
+#: fetch-pack.c:403 fetch-pack.c:1466
4162
#, c-format
4163
msgid "invalid unshallow line: %s"
4164
msgstr "ogiltig \"unshallow\"-rad: %s"
4165
4071
-#: fetch-pack.c:403 fetch-pack.c:1447
4166
+#: fetch-pack.c:405 fetch-pack.c:1468
4167
#, c-format
4168
msgid "object not found: %s"
4169
msgstr "objektet hittades inte: %s"
4170
4076
-#: fetch-pack.c:406 fetch-pack.c:1450
4171
+#: fetch-pack.c:408 fetch-pack.c:1471
4172
#, c-format
4173
msgid "error in object: %s"
4174
msgstr "fel i objekt: %s"
4175
4081
-#: fetch-pack.c:408 fetch-pack.c:1452
4176
+#: fetch-pack.c:410 fetch-pack.c:1473
4177
#, c-format
4178
msgid "no shallow found: %s"
4179
msgstr "ingen \"shallow\" hittades: %s"
4180
4086
-#: fetch-pack.c:411 fetch-pack.c:1456
4181
+#: fetch-pack.c:413 fetch-pack.c:1477
4182
#, c-format
4183
msgid "expected shallow/unshallow, got %s"
4184
msgstr "förväntade shallow/unshallow, fick %s"
4185
4091
-#: fetch-pack.c:451
4186
+#: fetch-pack.c:453
4187
#, c-format
4188
msgid "got %s %d %s"
4189
msgstr "fick %s %d %s"
4190
4096
-#: fetch-pack.c:468
4191
+#: fetch-pack.c:470
4192
#, c-format
4193
msgid "invalid commit %s"
4194
msgstr "ogiltig incheckning %s"
4195
4101
-#: fetch-pack.c:499
4196
+#: fetch-pack.c:501
4197
msgid "giving up"
4198
msgstr "ger upp"
4199
4105
-#: fetch-pack.c:512 progress.c:339
4200
+#: fetch-pack.c:514 progress.h:25
4201
msgid "done"
4202
msgstr "klart"
4203
4109
-#: fetch-pack.c:524
4204
+#: fetch-pack.c:526
4205
#, c-format
4206
msgid "got %s (%d) %s"
4207
msgstr "fick %s (%d) %s"
4208
4114
-#: fetch-pack.c:560
4209
+#: fetch-pack.c:562
4210
#, c-format
4211
msgid "Marking %s as complete"
4212
msgstr "Markerar %s som komplett"
4213
4119
-#: fetch-pack.c:775
4214
+#: fetch-pack.c:784
4215
#, c-format
4216
msgid "already have %s (%s)"
4217
msgstr "har redan %s (%s)"
4218
4124
-#: fetch-pack.c:861
4219
+#: fetch-pack.c:870
4220
msgid "fetch-pack: unable to fork off sideband demultiplexer"
4221
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
4222
4128
-#: fetch-pack.c:869
4223
+#: fetch-pack.c:878
4224
msgid "protocol error: bad pack header"
4225
msgstr "protokollfel: felaktigt packhuvud"
4226
4132
-#: fetch-pack.c:965
4227
+#: fetch-pack.c:974
4228
#, c-format
4229
msgid "fetch-pack: unable to fork off %s"
4230
msgstr "fetch-patch: kunde inte grena av %s"
4231
4137
-#: fetch-pack.c:971
4232
+#: fetch-pack.c:980
4233
msgid "fetch-pack: invalid index-pack output"
4234
msgstr "fetch-patch: ogiltig utdata från index-pack"
4235
4141
-#: fetch-pack.c:988
4236
+#: fetch-pack.c:997
4237
#, c-format
4238
msgid "%s failed"
4239
msgstr "%s misslyckades"
4240
4146
-#: fetch-pack.c:990
4241
+#: fetch-pack.c:999
4242
msgid "error in sideband demultiplexer"
4243
msgstr "fel i sidbands-avmultiplexare"
4244
4150
-#: fetch-pack.c:1035
4245
+#: fetch-pack.c:1048
4246
#, c-format
4247
msgid "Server version is %.*s"
4248
msgstr "Serverversionen är %.*s"
4249
4155
-#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
4156
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
4157
-#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
4158
-#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
4250
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
4251
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
4252
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
4253
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
4254
#, c-format
4255
msgid "Server supports %s"
4256
msgstr "Servern stöder %s"
4257
4163
-#: fetch-pack.c:1045
4258
+#: fetch-pack.c:1058
4259
msgid "Server does not support shallow clients"
4260
msgstr "Servern stöder inte klienter med grunda arkiv"
4261
4167
-#: fetch-pack.c:1105
4262
+#: fetch-pack.c:1118
4263
msgid "Server does not support --shallow-since"
4264
msgstr "Servern stöder inte --shallow-since"
4265
4171
-#: fetch-pack.c:1110
4266
+#: fetch-pack.c:1123
4267
msgid "Server does not support --shallow-exclude"
4268
msgstr "Servern stöder inte --shallow-exclude"
4269
4175
-#: fetch-pack.c:1114
4270
+#: fetch-pack.c:1127
4271
msgid "Server does not support --deepen"
4272
msgstr "Servern stöder inte --deepen"
4273
4179
-#: fetch-pack.c:1116
4274
+#: fetch-pack.c:1129
4275
msgid "Server does not support this repository's object format"
4276
msgstr "Servern stöder inte det här arkivets objektformat"
4277
4183
-#: fetch-pack.c:1129
4278
+#: fetch-pack.c:1142
4279
msgid "no common commits"
4280
msgstr "inga gemensamma incheckningar"
4281
4187
-#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
4282
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
4283
msgid "source repository is shallow, reject to clone."
4284
msgstr "källarkivet är grunt, tillåter inte kloning."
4285
4191
-#: fetch-pack.c:1144 fetch-pack.c:1681
4286
+#: fetch-pack.c:1157 fetch-pack.c:1705
4287
msgid "git fetch-pack: fetch failed."
4288
msgstr "git fetch-pack: hämtning misslyckades."
4289
4195
-#: fetch-pack.c:1258
4290
+#: fetch-pack.c:1271
4291
#, c-format
4292
msgid "mismatched algorithms: client %s; server %s"
4293
msgstr "omaka algoritmer: klient %s; server %s"
4294
4200
-#: fetch-pack.c:1262
4295
+#: fetch-pack.c:1275
4296
#, c-format
4297
msgid "the server does not support algorithm '%s'"
4298
msgstr "servern stöder inte algoritmen \"%s\""
4299
4205
-#: fetch-pack.c:1295
4300
+#: fetch-pack.c:1308
4301
msgid "Server does not support shallow requests"
4302
msgstr "Servern stöder inte grunda förfrågningar"
4303
4209
-#: fetch-pack.c:1302
4304
+#: fetch-pack.c:1315
4305
msgid "Server supports filter"
4306
msgstr "Servern stöder filter"
4307
4213
-#: fetch-pack.c:1345 fetch-pack.c:2063
4308
+#: fetch-pack.c:1358 fetch-pack.c:2087
4309
msgid "unable to write request to remote"
4310
msgstr "kunde inte skriva anrop till fjärren"
4311
4217
-#: fetch-pack.c:1363
4312
+#: fetch-pack.c:1376
4313
#, c-format
4314
msgid "error reading section header '%s'"
4315
msgstr "fel vid läsning av styckehuvudet \"%s\""
4316
4222
-#: fetch-pack.c:1369
4317
+#: fetch-pack.c:1382
4318
#, c-format
4319
msgid "expected '%s', received '%s'"
4320
msgstr "förväntade \"%s\", tog emot \"%s\""
4321
4227
-#: fetch-pack.c:1403
4322
+#: fetch-pack.c:1416
4323
#, c-format
4324
msgid "unexpected acknowledgment line: '%s'"
4325
msgstr "oväntad bekräftelserad: \"%s\""
4326
4232
-#: fetch-pack.c:1408
4327
+#: fetch-pack.c:1421
4328
#, c-format
4329
msgid "error processing acks: %d"
4330
msgstr "fel vid hantering av bekräftelser: %d"
4331
4237
-#: fetch-pack.c:1418
4238
-msgid "expected packfile to be sent after 'ready'"
4239
-msgstr "väntade att paketfil skulle sändas efter \"ready\""
4332
+#. TRANSLATORS: The parameter will be 'ready', a protocol
4333
+#. keyword.
4334
+#.
4335
+#: fetch-pack.c:1435
4336
+#, c-format
4337
+msgid "expected packfile to be sent after '%s'"
4338
+msgstr "väntade att paketfil skulle sändas efter \"%s\""
4339
4241
-#: fetch-pack.c:1420
4242
-msgid "expected no other sections to be sent after no 'ready'"
4340
+#. TRANSLATORS: The parameter will be 'ready', a protocol
4341
+#. keyword.
4342
+#.
4343
+#: fetch-pack.c:1441
4344
+#, c-format
4345
+msgid "expected no other sections to be sent after no '%s'"
4346
msgstr ""
4244
-"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
4347
+"väntade inte att några ytterligare sektioner skulle sändas efter \"%s\""
4348
4246
-#: fetch-pack.c:1461
4349
+#: fetch-pack.c:1482
4350
#, c-format
4351
msgid "error processing shallow info: %d"
4352
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
4353
4251
-#: fetch-pack.c:1510
4354
+#: fetch-pack.c:1531
4355
#, c-format
4356
msgid "expected wanted-ref, got '%s'"
4357
msgstr "förväntade wanted-ref, fick %s"
4358
4256
-#: fetch-pack.c:1515
4359
+#: fetch-pack.c:1536
4360
#, c-format
4361
msgid "unexpected wanted-ref: '%s'"
4362
msgstr "oväntad wanted-ref: \"%s\""
4363
4261
-#: fetch-pack.c:1520
4364
+#: fetch-pack.c:1541
4365
#, c-format
4366
msgid "error processing wanted refs: %d"
4367
msgstr "fel vid hantering av önskade referenser: %d"
4368
4266
-#: fetch-pack.c:1550
4369
+#: fetch-pack.c:1571
4370
msgid "git fetch-pack: expected response end packet"
4371
msgstr "git fetch-pack: förväntade svarsavslutningspaket"
4372
4270
-#: fetch-pack.c:1959
4373
+#: fetch-pack.c:1983
4374
msgid "no matching remote head"
4375
msgstr "inget motsvarande fjärrhuvud"
4376
4274
-#: fetch-pack.c:1982 builtin/clone.c:581
4377
+#: fetch-pack.c:2006 builtin/clone.c:587
4378
msgid "remote did not send all necessary objects"
4379
msgstr "fjärren sände inte alla nödvändiga objekt"
4380
4278
-#: fetch-pack.c:2085
4381
+#: fetch-pack.c:2109
4382
msgid "unexpected 'ready' from remote"
4383
msgstr "oväntat \"ready\" från fjärr"
4384
4282
-#: fetch-pack.c:2108
4385
+#: fetch-pack.c:2132
4386
#, c-format
4387
msgid "no such remote ref %s"
4388
msgstr "ingen sådan fjärreferens: %s"
4389
4287
-#: fetch-pack.c:2111
4390
+#: fetch-pack.c:2135
4391
#, c-format
4392
msgid "Server does not allow request for unadvertised object %s"
4393
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
4394
4292
-#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4293
-#: gpg-interface.c:990
4395
+#: fsmonitor-ipc.c:119
4396
+#, c-format
4397
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
4398
+msgstr "fsmonitor_ipc__send_query: ogilitg sökväg \"%s\""
4399
+
4400
+#: fsmonitor-ipc.c:125
4401
+#, c-format
4402
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
4403
+msgstr "fsmonitor_ipc__send_query: ospecificerat fel på \"%s\""
4404
+
4405
+#: fsmonitor-ipc.c:155
4406
+msgid "fsmonitor--daemon is not running"
4407
+msgstr "fsmonitor--daemon kör inte"
4408
+
4409
+#: fsmonitor-ipc.c:164
4410
+#, c-format
4411
+msgid "could not send '%s' command to fsmonitor--daemon"
4412
+msgstr "kunde inte sända kommandot \"%s\" till fsmonitor--daemon"
4413
+
4414
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
4415
+#: gpg-interface.c:1011
4416
msgid "could not create temporary file"
4417
msgstr "kunde inte skapa temporära fil"
4418
4297
-#: gpg-interface.c:332 gpg-interface.c:460
4419
+#: gpg-interface.c:332 gpg-interface.c:459
4420
#, c-format
4421
msgid "failed writing detached signature to '%s'"
4422
msgstr "misslyckades skriva fristående signatur till \"%s\""
4423
4302
-#: gpg-interface.c:451
4424
+#: gpg-interface.c:450
4425
msgid ""
4426
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4427
"signature verification"
@@ -4307,7 +4429,7 @@ msgstr ""
4429
"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
4430
"signaturer"
4431
4310
-#: gpg-interface.c:480
4432
+#: gpg-interface.c:479
4433
msgid ""
4434
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
4435
"verification (available in openssh version 8.2p1+)"
@@ -4315,56 +4437,56 @@ msgstr ""
4437
"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"
4438
"signaturer (tillgängligt i openssh version 8.2p1+)"
4439
4318
-#: gpg-interface.c:536
4440
+#: gpg-interface.c:550
4441
#, c-format
4442
msgid "ssh signing revocation file configured but not found: %s"
4443
msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
4444
4323
-#: gpg-interface.c:624
4445
+#: gpg-interface.c:638
4446
#, c-format
4447
msgid "bad/incompatible signature '%s'"
4448
msgstr "felaktig/inkompatibel signatur \"%s\""
4449
4328
-#: gpg-interface.c:801 gpg-interface.c:806
4450
+#: gpg-interface.c:815 gpg-interface.c:820
4451
#, c-format
4452
msgid "failed to get the ssh fingerprint for key '%s'"
4453
msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
4454
4333
-#: gpg-interface.c:829
4455
+#: gpg-interface.c:843
4456
msgid ""
4457
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4458
msgstr ""
4459
"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
4460
4339
-#: gpg-interface.c:851
4461
+#: gpg-interface.c:865
4462
#, c-format
4463
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
4464
msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
4465
4344
-#: gpg-interface.c:857
4466
+#: gpg-interface.c:871
4467
#, c-format
4468
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4469
msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
4470
4349
-#: gpg-interface.c:945
4471
+#: gpg-interface.c:966
4472
msgid "gpg failed to sign the data"
4473
msgstr "gpg misslyckades signera data"
4474
4353
-#: gpg-interface.c:967
4475
+#: gpg-interface.c:988
4476
msgid "user.signingkey needs to be set for ssh signing"
4477
msgstr "user.signingkey måste anges för ssh-signering"
4478
4357
-#: gpg-interface.c:978
4479
+#: gpg-interface.c:999
4480
#, c-format
4481
msgid "failed writing ssh signing key to '%s'"
4482
msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
4483
4362
-#: gpg-interface.c:996
4484
+#: gpg-interface.c:1017
4485
#, c-format
4486
msgid "failed writing ssh signing key buffer to '%s'"
4487
msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
4488
4367
-#: gpg-interface.c:1014
4489
+#: gpg-interface.c:1035
4490
msgid ""
4491
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4492
"8.2p1+)"
@@ -4372,7 +4494,7 @@ msgstr ""
4494
"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
4495
"version 8.2p1+)"
4496
4375
-#: gpg-interface.c:1026
4497
+#: gpg-interface.c:1047
4498
#, c-format
4499
msgid "failed reading ssh signing data buffer from '%s'"
4500
msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
@@ -4382,7 +4504,7 @@ msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
4504
msgid "ignored invalid color '%.*s' in log.graphColors"
4505
msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
4506
4385
-#: grep.c:531
4507
+#: grep.c:446
4508
msgid ""
4509
"given pattern contains NULL byte (via -f <file>). This is only supported "
4510
"with -P under PCRE v2"
@@ -4390,109 +4512,109 @@ msgstr ""
4512
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
4513
"P under PCRE v2"
4514
4393
-#: grep.c:1942
4515
+#: grep.c:1859
4516
#, c-format
4517
msgid "'%s': unable to read %s"
4518
msgstr "\"%s\" kunde inte läsa %s"
4519
4398
-#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
4520
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
4521
#: builtin/rm.c:136
4522
#, c-format
4523
msgid "failed to stat '%s'"
4524
msgstr "misslyckades ta status på \"%s\""
4525
4404
-#: grep.c:1970
4526
+#: grep.c:1887
4527
#, c-format
4528
msgid "'%s': short read"
4529
msgstr "\"%s\": kort läsning"
4530
4409
-#: help.c:24
4531
+#: help.c:25
4532
msgid "start a working area (see also: git help tutorial)"
4533
msgstr "starta arbetskatalog (se också: git help tutorial)"
4534
4413
-#: help.c:25
4535
+#: help.c:26
4536
msgid "work on the current change (see also: git help everyday)"
4537
msgstr "jobba med aktuell förändring (se också: git help everyday)"
4538
4417
-#: help.c:26
4539
+#: help.c:27
4540
msgid "examine the history and state (see also: git help revisions)"
4541
msgstr "utforska historiken och tillståndet (se också: git help revisions)"
4542
4421
-#: help.c:27
4543
+#: help.c:28
4544
msgid "grow, mark and tweak your common history"
4545
msgstr "utöka, markera och justera din gemensamma historik"
4546
4425
-#: help.c:28
4547
+#: help.c:29
4548
msgid "collaborate (see also: git help workflows)"
4549
msgstr "samarbeta (se också: git help workflows)"
4550
4429
-#: help.c:32
4551
+#: help.c:33
4552
msgid "Main Porcelain Commands"
4553
msgstr "Huvudsakliga porslinskommandon"
4554
4433
-#: help.c:33
4555
+#: help.c:34
4556
msgid "Ancillary Commands / Manipulators"
4557
msgstr "Tilläggskommandon / manipulerare"
4558
4437
-#: help.c:34
4559
+#: help.c:35
4560
msgid "Ancillary Commands / Interrogators"
4561
msgstr "Tilläggskommandon / frågare"
4562
4441
-#: help.c:35
4563
+#: help.c:36
4564
msgid "Interacting with Others"
4565
msgstr "Interaktion med andra"
4566
4445
-#: help.c:36
4567
+#: help.c:37
4568
msgid "Low-level Commands / Manipulators"
4569
msgstr "Lågnivåkommandon / maniupulerare"
4570
4449
-#: help.c:37
4571
+#: help.c:38
4572
msgid "Low-level Commands / Interrogators"
4573
msgstr "Lågnivåkommandon / frågare"
4574
4453
-#: help.c:38
4575
+#: help.c:39
4576
msgid "Low-level Commands / Syncing Repositories"
4577
msgstr "Lågnivåkommandon / synka arkiv"
4578
4457
-#: help.c:39
4579
+#: help.c:40
4580
msgid "Low-level Commands / Internal Helpers"
4581
msgstr "Lågnivåkommandon / interna hjälpare"
4582
4461
-#: help.c:313
4583
+#: help.c:316
4584
#, c-format
4585
msgid "available git commands in '%s'"
4586
msgstr "git-kommandon tillgängliga i \"%s\""
4587
4466
-#: help.c:320
4588
+#: help.c:323
4589
msgid "git commands available from elsewhere on your $PATH"
4590
msgstr "git-kommandon från andra platser i din $PATH"
4591
4470
-#: help.c:329
4592
+#: help.c:332
4593
msgid "These are common Git commands used in various situations:"
4594
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
4595
4474
-#: help.c:378 git.c:100
4596
+#: help.c:382 git.c:100
4597
#, c-format
4598
msgid "unsupported command listing type '%s'"
4599
msgstr "okänd kommandolisttyp \"%s\""
4600
4479
-#: help.c:418
4601
+#: help.c:422
4602
msgid "The Git concept guides are:"
4603
msgstr "Vägledningar för Git-koncept:"
4604
4483
-#: help.c:442
4484
-msgid "See 'git help <command>' to read about a specific subcommand"
4485
-msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
4486
-
4487
-#: help.c:447
4605
+#: help.c:446
4606
msgid "External commands"
4607
msgstr "Externa kommandon"
4608
4491
-#: help.c:462
4609
+#: help.c:468
4610
msgid "Command aliases"
4611
msgstr "Kommadoalias"
4612
4495
-#: help.c:543
4613
+#: help.c:486
4614
+msgid "See 'git help <command>' to read about a specific subcommand"
4615
+msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
4616
+
4617
+#: help.c:563
4618
#, c-format
4619
msgid ""
4620
"'%s' appears to be a git command, but we were not\n"
@@ -4501,37 +4623,37 @@ msgstr ""
4623
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
4624
"köra det. Kanske git-%s är trasigt?"
4625
4504
-#: help.c:565 help.c:662
4626
+#: help.c:585 help.c:682
4627
#, c-format
4628
msgid "git: '%s' is not a git command. See 'git --help'."
4629
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
4630
4509
-#: help.c:613
4631
+#: help.c:633
4632
msgid "Uh oh. Your system reports no Git commands at all."
4633
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
4634
4513
-#: help.c:635
4635
+#: help.c:655
4636
#, c-format
4637
msgid "WARNING: You called a Git command named '%s', which does not exist."
4638
msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
4639
4518
-#: help.c:640
4640
+#: help.c:660
4641
#, c-format
4642
msgid "Continuing under the assumption that you meant '%s'."
4643
msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
4644
4523
-#: help.c:646
4645
+#: help.c:666
4646
#, c-format
4647
msgid "Run '%s' instead [y/N]? "
4648
msgstr "Köra \"%s\" istället (j/N)?"
4649
4528
-#: help.c:654
4650
+#: help.c:674
4651
#, c-format
4652
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4653
msgstr ""
4654
"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
4655
4534
-#: help.c:666
4656
+#: help.c:686
4657
msgid ""
4658
"\n"
4659
"The most similar command is"
@@ -4545,16 +4667,16 @@ msgstr[1] ""
4667
"\n"
4668
"Mest lika kommandon är"
4669
4548
-#: help.c:706
4670
+#: help.c:729
4671
msgid "git version [<options>]"
4672
msgstr "git version [<flaggor>]"
4673
4552
-#: help.c:761
4674
+#: help.c:784
4675
#, c-format
4676
msgid "%s: %s - %s"
4677
msgstr "%s: %s - %s"
4678
4557
-#: help.c:765
4679
+#: help.c:788
4680
msgid ""
4681
"\n"
4682
"Did you mean this?"
@@ -4568,7 +4690,7 @@ msgstr[1] ""
4690
"\n"
4691
"Menade du ett av dessa?"
4692
4571
-#: hook.c:27
4693
+#: hook.c:28
4694
#, c-format
4695
msgid ""
4696
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -4577,15 +4699,20 @@ msgstr ""
4699
"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
4700
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
4701
4580
-#: ident.c:353
4702
+#: hook.c:87
4703
+#, c-format
4704
+msgid "Couldn't start hook '%s'\n"
4705
+msgstr "Kunde inte starta kroken \"%s\"\n"
4706
+
4707
+#: ident.c:354
4708
msgid "Author identity unknown\n"
4709
msgstr "Författar-identitet okänd\n"
4710
4584
-#: ident.c:356
4711
+#: ident.c:357
4712
msgid "Committer identity unknown\n"
4713
msgstr "Incheckar-identitet okänd\n"
4714
4588
-#: ident.c:362
4715
+#: ident.c:363
4716
msgid ""
4717
"\n"
4718
"*** Please tell me who you are.\n"
@@ -4611,71 +4738,71 @@ msgstr ""
4738
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
4739
"\n"
4740
4614
-#: ident.c:397
4741
+#: ident.c:398
4742
msgid "no email was given and auto-detection is disabled"
4743
msgstr "ingen e-post angavs och autodetektering är inaktiverad"
4744
4618
-#: ident.c:402
4745
+#: ident.c:403
4746
#, c-format
4747
msgid "unable to auto-detect email address (got '%s')"
4748
msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
4749
4623
-#: ident.c:419
4750
+#: ident.c:420
4751
msgid "no name was given and auto-detection is disabled"
4752
msgstr "inget namn angavs och autodetektering är inaktiverad"
4753
4627
-#: ident.c:425
4754
+#: ident.c:426
4755
#, c-format
4756
msgid "unable to auto-detect name (got '%s')"
4757
msgstr "kunde inte autodetektera namn (fick \"%s\")"
4758
4632
-#: ident.c:433
4759
+#: ident.c:434
4760
#, c-format
4761
msgid "empty ident name (for <%s>) not allowed"
4762
msgstr "tomt ident-namn (för <%s>) ej tillåtet"
4763
4637
-#: ident.c:439
4764
+#: ident.c:440
4765
#, c-format
4766
msgid "name consists only of disallowed characters: %s"
4767
msgstr "namnet består enbart av ej tillåtna tecken: %s"
4768
4642
-#: ident.c:454 builtin/commit.c:648
4769
+#: ident.c:455 builtin/commit.c:649
4770
#, c-format
4771
msgid "invalid date format: %s"
4772
msgstr "felaktigt datumformat: %s"
4773
4647
-#: list-objects-filter-options.c:83
4774
+#: list-objects-filter-options.c:68
4775
msgid "expected 'tree:<depth>'"
4776
msgstr "förväntade \"tree:<djup>\""
4777
4651
-#: list-objects-filter-options.c:98
4778
+#: list-objects-filter-options.c:83
4779
msgid "sparse:path filters support has been dropped"
4780
msgstr "sparse:sökväg-filter stöds inte längre"
4781
4655
-#: list-objects-filter-options.c:105
4782
+#: list-objects-filter-options.c:90
4783
#, c-format
4784
msgid "'%s' for 'object:type=<type>' is not a valid object type"
4785
msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"
4786
4660
-#: list-objects-filter-options.c:124
4787
+#: list-objects-filter-options.c:109
4788
#, c-format
4789
msgid "invalid filter-spec '%s'"
4790
msgstr "felaktig filterspecifikation: \"%s\""
4791
4665
-#: list-objects-filter-options.c:140
4792
+#: list-objects-filter-options.c:125
4793
#, c-format
4794
msgid "must escape char in sub-filter-spec: '%c'"
4795
msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
4796
4670
-#: list-objects-filter-options.c:182
4797
+#: list-objects-filter-options.c:167
4798
msgid "expected something after combine:"
4799
msgstr "förväntade någonting efter combine:"
4800
4674
-#: list-objects-filter-options.c:264
4801
+#: list-objects-filter-options.c:249
4802
msgid "multiple filter-specs cannot be combined"
4803
msgstr "flera filterspecifikationer kan inte kombineras"
4804
4678
-#: list-objects-filter-options.c:376
4805
+#: list-objects-filter-options.c:365
4806
msgid "unable to upgrade repository format to support partial clone"
4807
msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"
4808
@@ -4689,17 +4816,17 @@ msgstr "kunde inte nå gles blob på \"%s\""
4816
msgid "unable to parse sparse filter data in %s"
4817
msgstr "kunde inte tolka gles filterdata i %s"
4818
4692
-#: list-objects.c:127
4819
+#: list-objects.c:144
4820
#, c-format
4821
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4822
msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
4823
4697
-#: list-objects.c:140
4824
+#: list-objects.c:157
4825
#, c-format
4826
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4827
msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
4828
4702
-#: list-objects.c:398
4829
+#: list-objects.c:415
4830
#, c-format
4831
msgid "unable to load root tree for commit %s"
4832
msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
@@ -4729,17 +4856,12 @@ msgstr ""
4856
msgid "Unable to create '%s.lock': %s"
4857
msgstr "Kunde inte skapa \"%s.lock\": %s"
4858
4732
-#: ls-refs.c:37
4733
-#, c-format
4734
-msgid "invalid value '%s' for lsrefs.unborn"
4735
-msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
4736
-
4737
-#: ls-refs.c:174
4859
+#: ls-refs.c:175
4860
#, c-format
4861
msgid "unexpected line: '%s'"
4862
msgstr "oväntad rad: \"%s\""
4863
4742
-#: ls-refs.c:178
4864
+#: ls-refs.c:179
4865
msgid "expected flush after ls-refs arguments"
4866
msgstr "förväntade \"flush\" efter ls-refs-argument"
4867
@@ -4747,39 +4869,39 @@ msgstr "förväntade \"flush\" efter ls-refs-argument"
4869
msgid "quoted CRLF detected"
4870
msgstr "citerad CRLF upptäcktes"
4871
4750
-#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
4872
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
4873
#, c-format
4874
msgid "bad action '%s' for '%s'"
4875
msgstr "felaktig funktion \"%s\" för \"%s\""
4876
4755
-#: merge-ort.c:1584 merge-recursive.c:1211
4877
+#: merge-ort.c:1630 merge-recursive.c:1214
4878
#, c-format
4879
msgid "Failed to merge submodule %s (not checked out)"
4880
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
4881
4760
-#: merge-ort.c:1593 merge-recursive.c:1218
4882
+#: merge-ort.c:1639 merge-recursive.c:1221
4883
#, c-format
4884
msgid "Failed to merge submodule %s (commits not present)"
4885
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
4886
4765
-#: merge-ort.c:1602 merge-recursive.c:1225
4887
+#: merge-ort.c:1648 merge-recursive.c:1228
4888
#, c-format
4889
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4890
msgstr ""
4891
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
4892
"sammanslagningsbasen)"
4893
4772
-#: merge-ort.c:1612 merge-ort.c:1620
4894
+#: merge-ort.c:1658 merge-ort.c:1666
4895
#, c-format
4896
msgid "Note: Fast-forwarding submodule %s to %s"
4897
msgstr "Obs: Snabbspolar undermodulen %s till %s"
4898
4777
-#: merge-ort.c:1642
4899
+#: merge-ort.c:1688
4900
#, c-format
4901
msgid "Failed to merge submodule %s"
4902
msgstr "Misslyckades slå ihop undermodulen %s"
4903
4782
-#: merge-ort.c:1649
4904
+#: merge-ort.c:1695
4905
#, c-format
4906
msgid ""
4907
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4788,7 +4910,7 @@ msgstr ""
4910
"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
4911
"%s\n"
4912
4791
-#: merge-ort.c:1653 merge-recursive.c:1281
4913
+#: merge-ort.c:1699 merge-recursive.c:1284
4914
#, c-format
4915
msgid ""
4916
"If this is correct simply add it to the index for example\n"
@@ -4805,7 +4927,7 @@ msgstr ""
4927
"\n"
4928
"vilket godtar lösningen.\n"
4929
4808
-#: merge-ort.c:1666
4930
+#: merge-ort.c:1712
4931
#, c-format
4932
msgid ""
4933
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4815,21 +4937,21 @@ msgstr ""
4937
"finns:\n"
4938
"%s"
4939
4818
-#: merge-ort.c:1887 merge-recursive.c:1372
4940
+#: merge-ort.c:1937 merge-recursive.c:1375
4941
msgid "Failed to execute internal merge"
4942
msgstr "Misslyckades exekvera intern sammanslagning"
4943
4822
-#: merge-ort.c:1892 merge-recursive.c:1377
4944
+#: merge-ort.c:1942 merge-recursive.c:1380
4945
#, c-format
4946
msgid "Unable to add %s to database"
4947
msgstr "Kunde inte lägga till %s till databasen"
4948
4827
-#: merge-ort.c:1899 merge-recursive.c:1410
4949
+#: merge-ort.c:1949 merge-recursive.c:1413
4950
#, c-format
4951
msgid "Auto-merging %s"
4952
msgstr "Slår ihop %s automatiskt"
4953
4832
-#: merge-ort.c:2038 merge-recursive.c:2132
4954
+#: merge-ort.c:2088 merge-recursive.c:2135
4955
#, c-format
4956
msgid ""
4957
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4838,7 +4960,7 @@ msgstr ""
4960
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
4961
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
4962
4841
-#: merge-ort.c:2048 merge-recursive.c:2142
4963
+#: merge-ort.c:2098 merge-recursive.c:2145
4964
#, c-format
4965
msgid ""
4966
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4847,7 +4969,7 @@ msgstr ""
4969
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
4970
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
4971
4850
-#: merge-ort.c:2106
4972
+#: merge-ort.c:2156
4973
#, c-format
4974
msgid ""
4975
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4858,7 +4980,7 @@ msgstr ""
4980
"den har namnbytts till flera andra kataloger, utan att någon destination "
4981
"fick en majoritet av filerna."
4982
4861
-#: merge-ort.c:2260 merge-recursive.c:2478
4983
+#: merge-ort.c:2310 merge-recursive.c:2481
4984
#, c-format
4985
msgid ""
4986
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4867,7 +4989,7 @@ msgstr ""
4989
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
4990
"bytt namn."
4991
4870
-#: merge-ort.c:2400 merge-recursive.c:3261
4992
+#: merge-ort.c:2450 merge-recursive.c:3264
4993
#, c-format
4994
msgid ""
4995
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4876,7 +4998,7 @@ msgstr ""
4998
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
4999
"flyttar den till %s."
5000
4879
-#: merge-ort.c:2407 merge-recursive.c:3268
5001
+#: merge-ort.c:2457 merge-recursive.c:3271
5002
#, c-format
5003
msgid ""
5004
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4885,7 +5007,7 @@ msgstr ""
5007
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
5008
"namn i %s; flyttar den till %s."
5009
4888
-#: merge-ort.c:2420 merge-recursive.c:3264
5010
+#: merge-ort.c:2470 merge-recursive.c:3267
5011
#, c-format
5012
msgid ""
5013
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4894,7 +5016,7 @@ msgstr ""
5016
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
5017
"%s, föreslår att den bör flyttas till%s."
5018
4897
-#: merge-ort.c:2428 merge-recursive.c:3271
5019
+#: merge-ort.c:2478 merge-recursive.c:3274
5020
#, c-format
5021
msgid ""
5022
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4903,13 +5025,13 @@ msgstr ""
5025
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
5026
"bytte namn i %s; flyttar den till %s."
5027
4906
-#: merge-ort.c:2584
5028
+#: merge-ort.c:2634
5029
#, c-format
5030
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
5031
msgstr ""
5032
"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
5033
4912
-#: merge-ort.c:2679
5034
+#: merge-ort.c:2729
5035
#, c-format
5036
msgid ""
5037
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4920,23 +5042,23 @@ msgstr ""
5042
"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
5043
"nästlade konfliktmarkörer."
5044
4923
-#: merge-ort.c:2698 merge-ort.c:2722
5045
+#: merge-ort.c:2748 merge-ort.c:2772
5046
#, c-format
5047
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
5048
msgstr ""
5049
"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
5050
4929
-#: merge-ort.c:3212 merge-recursive.c:3022
5051
+#: merge-ort.c:3261 merge-recursive.c:3025
5052
#, c-format
5053
msgid "cannot read object %s"
5054
msgstr "kan inte läsa objektet %s"
5055
4934
-#: merge-ort.c:3215 merge-recursive.c:3025
5056
+#: merge-ort.c:3264 merge-recursive.c:3028
5057
#, c-format
5058
msgid "object %s is not a blob"
5059
msgstr "objektet %s är inte en blob"
5060
4939
-#: merge-ort.c:3644
5061
+#: merge-ort.c:3693
5062
#, c-format
5063
msgid ""
5064
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4945,7 +5067,7 @@ msgstr ""
5067
"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
5068
"till %s istället."
5069
4948
-#: merge-ort.c:3721
5070
+#: merge-ort.c:3770
5071
#, c-format
5072
msgid ""
5073
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4954,7 +5076,7 @@ msgstr ""
5076
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
5077
"så att de kan protokollföras någonstans."
5078
4957
-#: merge-ort.c:3728
5079
+#: merge-ort.c:3777
5080
#, c-format
5081
msgid ""
5082
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4963,24 +5085,24 @@ msgstr ""
5085
"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
5086
"så att de kan protokollföras någonstans."
5087
4966
-#: merge-ort.c:3819 merge-recursive.c:3101
5088
+#: merge-ort.c:3866 merge-recursive.c:3104
5089
msgid "content"
5090
msgstr "innehåll"
5091
4970
-#: merge-ort.c:3821 merge-recursive.c:3105
5092
+#: merge-ort.c:3868 merge-recursive.c:3108
5093
msgid "add/add"
5094
msgstr "tillägg/tillägg"
5095
4974
-#: merge-ort.c:3823 merge-recursive.c:3150
5096
+#: merge-ort.c:3870 merge-recursive.c:3153
5097
msgid "submodule"
5098
msgstr "undermodul"
5099
4978
-#: merge-ort.c:3825 merge-recursive.c:3151
5100
+#: merge-ort.c:3872 merge-recursive.c:3154
5101
#, c-format
5102
msgid "CONFLICT (%s): Merge conflict in %s"
5103
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
5104
4983
-#: merge-ort.c:3869
5105
+#: merge-ort.c:3916
5106
#, c-format
5107
msgid ""
5108
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4989,7 +5111,7 @@ msgstr ""
5111
"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
5112
"lämnad i trädet."
5113
4992
-#: merge-ort.c:4165
5114
+#: merge-ort.c:4212
5115
#, c-format
5116
msgid ""
5117
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5001,12 +5123,12 @@ msgstr ""
5123
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5124
#. base, and 2-3) the trees for the two trees we're merging.
5125
#.
5004
-#: merge-ort.c:4534
5126
+#: merge-ort.c:4586
5127
#, c-format
5128
msgid "collecting merge info failed for trees %s, %s, %s"
5129
msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
5130
5009
-#: merge-ort-wrappers.c:13 merge-recursive.c:3716
5131
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
5132
#, c-format
5133
msgid ""
5134
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5016,7 +5138,7 @@ msgstr ""
5138
"sammanslagning:\n"
5139
" %s"
5140
5019
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
5141
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
5142
msgid "Already up to date."
5143
msgstr "Redan à jour."
5144
@@ -5056,7 +5178,7 @@ msgstr ": kanske en K/F-konflikt?"
5178
msgid "refusing to lose untracked file at '%s'"
5179
msgstr "vägrar förlora ospårad fil vid \"%s\""
5180
5059
-#: merge-recursive.c:956 builtin/cat-file.c:41
5181
+#: merge-recursive.c:956 builtin/cat-file.c:47
5182
#, c-format
5183
msgid "cannot read object %s '%s'"
5184
msgstr "kan inte läsa objektet %s: \"%s\""
@@ -5081,44 +5203,44 @@ msgstr "misslyckades skapa symboliska länken \"%s\": %s"
5203
msgid "do not know what to do with %06o %s '%s'"
5204
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
5205
5084
-#: merge-recursive.c:1233 merge-recursive.c:1246
5206
+#: merge-recursive.c:1236 merge-recursive.c:1249
5207
#, c-format
5208
msgid "Fast-forwarding submodule %s to the following commit:"
5209
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
5210
5089
-#: merge-recursive.c:1236 merge-recursive.c:1249
5211
+#: merge-recursive.c:1239 merge-recursive.c:1252
5212
#, c-format
5213
msgid "Fast-forwarding submodule %s"
5214
msgstr "Snabbspolar undermodulen %s"
5215
5094
-#: merge-recursive.c:1273
5216
+#: merge-recursive.c:1276
5217
#, c-format
5218
msgid "Failed to merge submodule %s (merge following commits not found)"
5219
msgstr ""
5220
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
5221
"hittades inte)"
5222
5101
-#: merge-recursive.c:1277
5223
+#: merge-recursive.c:1280
5224
#, c-format
5225
msgid "Failed to merge submodule %s (not fast-forward)"
5226
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
5227
5106
-#: merge-recursive.c:1278
5228
+#: merge-recursive.c:1281
5229
msgid "Found a possible merge resolution for the submodule:\n"
5230
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
5231
5110
-#: merge-recursive.c:1290
5232
+#: merge-recursive.c:1293
5233
#, c-format
5234
msgid "Failed to merge submodule %s (multiple merges found)"
5235
msgstr ""
5236
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
5237
5116
-#: merge-recursive.c:1434
5238
+#: merge-recursive.c:1437
5239
#, c-format
5240
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5241
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
5242
5121
-#: merge-recursive.c:1506
5243
+#: merge-recursive.c:1509
5244
#, c-format
5245
msgid ""
5246
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5127,7 +5249,7 @@ msgstr ""
5249
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
5250
"i trädet."
5251
5130
-#: merge-recursive.c:1511
5252
+#: merge-recursive.c:1514
5253
#, c-format
5254
msgid ""
5255
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5136,7 +5258,7 @@ msgstr ""
5258
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
5259
"%s lämnad i trädet."
5260
5139
-#: merge-recursive.c:1518
5261
+#: merge-recursive.c:1521
5262
#, c-format
5263
msgid ""
5264
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5145,7 +5267,7 @@ msgstr ""
5267
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
5268
"i trädet vid %s."
5269
5148
-#: merge-recursive.c:1523
5270
+#: merge-recursive.c:1526
5271
#, c-format
5272
msgid ""
5273
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5154,40 +5276,40 @@ msgstr ""
5276
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
5277
"%s lämnad i trädet vid %s."
5278
5157
-#: merge-recursive.c:1558
5279
+#: merge-recursive.c:1561
5280
msgid "rename"
5281
msgstr "namnbyte"
5282
5161
-#: merge-recursive.c:1558
5283
+#: merge-recursive.c:1561
5284
msgid "renamed"
5285
msgstr "namnbytt"
5286
5165
-#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
5287
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
5288
#, c-format
5289
msgid "Refusing to lose dirty file at %s"
5290
msgstr "Vägrar förlora lortig fil vid \"%s\""
5291
5170
-#: merge-recursive.c:1619
5292
+#: merge-recursive.c:1622
5293
#, c-format
5294
msgid "Refusing to lose untracked file at %s, even though it's in the way."
5295
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
5296
5175
-#: merge-recursive.c:1677
5297
+#: merge-recursive.c:1680
5298
#, c-format
5299
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5300
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
5301
5180
-#: merge-recursive.c:1708
5302
+#: merge-recursive.c:1711
5303
#, c-format
5304
msgid "%s is a directory in %s adding as %s instead"
5305
msgstr "%s är en katalog i %s lägger till som %s istället"
5306
5185
-#: merge-recursive.c:1713
5307
+#: merge-recursive.c:1716
5308
#, c-format
5309
msgid "Refusing to lose untracked file at %s; adding as %s instead"
5310
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
5311
5190
-#: merge-recursive.c:1740
5312
+#: merge-recursive.c:1743
5313
#, c-format
5314
msgid ""
5315
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5196,17 +5318,17 @@ msgstr ""
5318
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
5319
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
5320
5199
-#: merge-recursive.c:1745
5321
+#: merge-recursive.c:1748
5322
msgid " (left unresolved)"
5323
msgstr " (lämnad olöst)"
5324
5203
-#: merge-recursive.c:1837
5325
+#: merge-recursive.c:1840
5326
#, c-format
5327
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5328
msgstr ""
5329
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
5330
5209
-#: merge-recursive.c:2100
5331
+#: merge-recursive.c:2103
5332
#, c-format
5333
msgid ""
5334
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5217,7 +5339,7 @@ msgstr ""
5339
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
5340
"destination fick en majoritet av filerna."
5341
5220
-#: merge-recursive.c:2234
5342
+#: merge-recursive.c:2237
5343
#, c-format
5344
msgid ""
5345
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5226,79 +5348,79 @@ msgstr ""
5348
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
5349
"%s->%s i %s"
5350
5229
-#: merge-recursive.c:3089
5351
+#: merge-recursive.c:3092
5352
msgid "modify"
5353
msgstr "ändra"
5354
5233
-#: merge-recursive.c:3089
5355
+#: merge-recursive.c:3092
5356
msgid "modified"
5357
msgstr "ändrad"
5358
5237
-#: merge-recursive.c:3128
5359
+#: merge-recursive.c:3131
5360
#, c-format
5361
msgid "Skipped %s (merged same as existing)"
5362
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
5363
5242
-#: merge-recursive.c:3181
5364
+#: merge-recursive.c:3184
5365
#, c-format
5366
msgid "Adding as %s instead"
5367
msgstr "Lägger till som %s istället"
5368
5247
-#: merge-recursive.c:3385
This file is too large to show in full.