@matheusbsbs / matheus-bagliano / commits / f29b823c3a

l10n: sv.po: Update Swedish translation (5211t0f0)

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

Peter Krefting committed Nov 11, 2021 at 23:22 UTC f29b823c3a58919206fe50a4aac441f57d4d5686
1 file changed +97 -93
po/sv.po
+97 -93
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 2.34.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2021-11-04 08:34+0800\n"
11 -"PO-Revision-Date: 2021-11-04 20:44+0100\n"
10 +"POT-Creation-Date: 2021-11-10 08:55+0800\n"
11 +"PO-Revision-Date: 2021-11-11 23:20+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"
@@ -211,7 +211,7 @@ msgstr "ej köad"
211
212 #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
213 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
214 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
214 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
215 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
216 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
217 #: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
@@ -10427,7 +10427,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
10427 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
10428
10429 #: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
10430 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
10430 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
10431 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
10432 msgid "dry run"
10433 msgstr "testkörning"
@@ -10890,11 +10890,11 @@ msgstr "sänd det genom git-apply"
10890
10891 #: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
10892 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
10893 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
10893 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
10894 #: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
10895 #: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
10896 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
10897 -#: parse-options.h:316
10897 +#: parse-options.h:315
10898 msgid "n"
10899 msgstr "n"
10900
@@ -10945,7 +10945,7 @@ msgid "use current timestamp for author date"
10945 msgstr "använd nuvarande tidsstämpel för författardatum"
10946
10947 #: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
10948 -#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
10948 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
10949 #: builtin/revert.c:117 builtin/tag.c:460
10950 msgid "key-id"
10951 msgstr "nyckel-id"
@@ -11452,7 +11452,7 @@ msgstr "visa statistik över arbetskostnad"
11452 #: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
11453 #: builtin/merge.c:298 builtin/multi-pack-index.c:103
11454 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
11455 -#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
11455 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
11456 #: builtin/send-pack.c:202
11457 msgid "force progress reporting"
11458 msgstr "tvinga förloppsrapportering"
@@ -12721,7 +12721,7 @@ msgstr "saknar gren- eller incheckingsargument"
12721 msgid "perform a 3-way merge with the new branch"
12722 msgstr "utför en 3-vägssammanslagning för den nya grenen"
12723
12724 -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
12724 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
12725 msgid "style"
12726 msgstr "stil"
12727
@@ -13149,7 +13149,7 @@ msgid "path to git-upload-pack on the remote"
13149 msgstr "sökväg till git-upload-pack på fjärren"
13150
13151 #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
13152 -#: builtin/pull.c:208
13152 +#: builtin/pull.c:212
13153 msgid "depth"
13154 msgstr "djup"
13155
@@ -13158,7 +13158,7 @@ msgid "create a shallow clone of that depth"
13158 msgstr "skapa en grund klon på detta djup"
13159
13160 #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
13161 -#: builtin/pull.c:211
13161 +#: builtin/pull.c:215
13162 msgid "time"
13163 msgstr "tid"
13164
@@ -13167,11 +13167,11 @@ msgid "create a shallow clone since a specific time"
13167 msgstr "skapa en grund klon från en angiven tidpunkt"
13168
13169 #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
13170 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
13170 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
13171 msgid "revision"
13172 msgstr "revision"
13173
13174 -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
13174 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
13175 msgid "deepen history of shallow clone, excluding rev"
13176 msgstr "fördjupa historik för grund klon, exkludera revisionen"
13177
@@ -13205,23 +13205,23 @@ msgid "set config inside the new repository"
13205 msgstr "ställ in konfiguration i det nya arkivet"
13206
13207 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
13208 -#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
13208 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
13209 msgid "server-specific"
13210 msgstr "serverspecifik"
13211
13212 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
13213 -#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
13213 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
13214 msgid "option to transmit"
13215 msgstr ""
13216 "inget att checka in\n"
13217 "flagga att sända"
13218
13219 -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
13219 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
13220 #: builtin/push.c:576
13221 msgid "use IPv4 addresses only"
13222 msgstr "använd endast IPv4-adresser"
13223
13224 -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
13224 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
13225 #: builtin/push.c:578
13226 msgid "use IPv6 addresses only"
13227 msgstr "använd endast IPv6-adresser"
@@ -13612,7 +13612,7 @@ msgid "read commit log message from file"
13612 msgstr "läs incheckningsloggmeddelande från fil"
13613
13614 #: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
13615 -#: builtin/pull.c:176 builtin/revert.c:118
13615 +#: builtin/pull.c:180 builtin/revert.c:118
13616 msgid "GPG sign commit"
13617 msgstr "GPG-signera incheckning"
13618
@@ -14023,7 +14023,7 @@ msgstr "terminera poster med NUL"
14023
14024 #: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
14025 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202
14026 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
14026 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
14027 msgid "mode"
14028 msgstr "läge"
14029
@@ -14100,7 +14100,7 @@ msgid "override date for commit"
14100 msgstr "överstyr datum för incheckningen"
14101
14102 #: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
14103 -#: parse-options.h:328 ref-filter.h:92
14103 +#: parse-options.h:327 ref-filter.h:92
14104 msgid "commit"
14105 msgstr "incheckning"
14106
@@ -14145,7 +14145,7 @@ msgid "add custom trailer(s)"
14145 msgstr "använd skräddarsydd(a) släprad(er)"
14146
14147 #: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
14148 -#: builtin/pull.c:145 builtin/revert.c:110
14148 +#: builtin/pull.c:146 builtin/revert.c:110
14149 msgid "add a Signed-off-by trailer"
14150 msgstr "lägg till Signed-off-by-släprad"
14151
@@ -15121,15 +15121,15 @@ msgstr "git fetch --all [<flaggor>]"
15121 msgid "fetch.parallel cannot be negative"
15122 msgstr "fetch.parallel kan inte vara negativt"
15123
15124 -#: builtin/fetch.c:145 builtin/pull.c:185
15124 +#: builtin/fetch.c:145 builtin/pull.c:189
15125 msgid "fetch from all remotes"
15126 msgstr "hämta från alla fjärrar"
15127
15128 -#: builtin/fetch.c:147 builtin/pull.c:245
15128 +#: builtin/fetch.c:147 builtin/pull.c:249
15129 msgid "set upstream for git pull/fetch"
15130 msgstr "ställ in uppström för git pull/fetch"
15131
15132 -#: builtin/fetch.c:149 builtin/pull.c:188
15132 +#: builtin/fetch.c:149 builtin/pull.c:192
15133 msgid "append to .git/FETCH_HEAD instead of overwriting"
15134 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
15135
@@ -15137,7 +15137,7 @@ msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
15137 msgid "use atomic transaction to update references"
15138 msgstr "använd atomiska transaktioner för att uppdatera referenser"
15139
15140 -#: builtin/fetch.c:153 builtin/pull.c:191
15140 +#: builtin/fetch.c:153 builtin/pull.c:195
15141 msgid "path to upload pack on remote end"
15142 msgstr "sökväg till upload pack på fjärren"
15143
@@ -15149,7 +15149,7 @@ msgstr "tvinga överskrivning av lokal referens"
15149 msgid "fetch from multiple remotes"
15150 msgstr "hämta från flera fjärrar"
15151
15152 -#: builtin/fetch.c:158 builtin/pull.c:195
15152 +#: builtin/fetch.c:158 builtin/pull.c:199
15153 msgid "fetch all tags and associated objects"
15154 msgstr "hämta alla taggar och associerade objekt"
15155
@@ -15167,7 +15167,7 @@ msgstr ""
15167 "modifiera referensspecifikationen så att alla referenser hamnar i refs/"
15168 "prefetch/"
15169
15170 -#: builtin/fetch.c:166 builtin/pull.c:198
15170 +#: builtin/fetch.c:166 builtin/pull.c:202
15171 msgid "prune remote-tracking branches no longer on remote"
15172 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
15173
@@ -15176,7 +15176,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"
15176 msgstr ""
15177 "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
15178
15179 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
15179 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
15180 msgid "on-demand"
15181 msgstr "on-demand"
15182
@@ -15188,7 +15188,7 @@ msgstr "styr rekursiv hämtning av undermoduler"
15188 msgid "write fetched references to the FETCH_HEAD file"
15189 msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
15190
15191 -#: builtin/fetch.c:176 builtin/pull.c:206
15191 +#: builtin/fetch.c:176 builtin/pull.c:210
15192 msgid "keep downloaded pack"
15193 msgstr "behåll hämtade paket"
15194
@@ -15196,16 +15196,16 @@ msgstr "behåll hämtade paket"
15196 msgid "allow updating of HEAD ref"
15197 msgstr "tillåt uppdatering av HEAD-referens"
15198
15199 -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
15200 -#: builtin/pull.c:218
15199 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
15200 +#: builtin/pull.c:222
15201 msgid "deepen history of shallow clone"
15202 msgstr "fördjupa historik för grund klon"
15203
15204 -#: builtin/fetch.c:183 builtin/pull.c:212
15204 +#: builtin/fetch.c:183 builtin/pull.c:216
15205 msgid "deepen history of shallow repository based on time"
15206 msgstr "fördjupa historik för grund klon baserad på tid"
15207
15208 -#: builtin/fetch.c:189 builtin/pull.c:221
15208 +#: builtin/fetch.c:189 builtin/pull.c:225
15209 msgid "convert to a complete repository"
15210 msgstr "konvertera till komplett arkiv"
15211
@@ -15221,19 +15221,19 @@ msgstr ""
15221 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
15222 "konfigurationsfiler)"
15223
15224 -#: builtin/fetch.c:199 builtin/pull.c:224
15224 +#: builtin/fetch.c:199 builtin/pull.c:228
15225 msgid "accept refs that update .git/shallow"
15226 msgstr "tar emot referenser som uppdaterar .git/shallow"
15227
15228 -#: builtin/fetch.c:200 builtin/pull.c:226
15228 +#: builtin/fetch.c:200 builtin/pull.c:230
15229 msgid "refmap"
15230 msgstr "referenskarta"
15231
15232 -#: builtin/fetch.c:201 builtin/pull.c:227
15232 +#: builtin/fetch.c:201 builtin/pull.c:231
15233 msgid "specify fetch refmap"
15234 msgstr "ange referenskarta för \"fetch\""
15235
15236 -#: builtin/fetch.c:208 builtin/pull.c:240
15236 +#: builtin/fetch.c:208 builtin/pull.c:244
15237 msgid "report that we have only objects reachable from this object"
15238 msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
15239
@@ -15245,7 +15245,7 @@ msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
15245 msgid "run 'maintenance --auto' after fetching"
15246 msgstr "kör \"maintenance --auto\" efter hämtning"
15247
15248 -#: builtin/fetch.c:217 builtin/pull.c:243
15248 +#: builtin/fetch.c:217 builtin/pull.c:247
15249 msgid "check for forced-updates on all updated branches"
15250 msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
15251
@@ -17912,32 +17912,32 @@ msgstr "Tillgängliga strategier är:"
17912 msgid "Available custom strategies are:"
17913 msgstr "Tillgängliga skräddarsydda strategier är:"
17914
17915 -#: builtin/merge.c:257 builtin/pull.c:133
17915 +#: builtin/merge.c:257 builtin/pull.c:134
17916 msgid "do not show a diffstat at the end of the merge"
17917 msgstr "visa inte en diffstat när sammanslagningen är färdig"
17918
17919 -#: builtin/merge.c:260 builtin/pull.c:136
17919 +#: builtin/merge.c:260 builtin/pull.c:137
17920 msgid "show a diffstat at the end of the merge"
17921 msgstr "visa en diffstat när sammanslagningen är färdig"
17922
17923 -#: builtin/merge.c:261 builtin/pull.c:139
17923 +#: builtin/merge.c:261 builtin/pull.c:140
17924 msgid "(synonym to --stat)"
17925 msgstr "(synonym till --stat)"
17926
17927 -#: builtin/merge.c:263 builtin/pull.c:142
17927 +#: builtin/merge.c:263 builtin/pull.c:143
17928 msgid "add (at most <n>) entries from shortlog to merge commit message"
17929 msgstr ""
17930 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
17931
17932 -#: builtin/merge.c:266 builtin/pull.c:148
17932 +#: builtin/merge.c:266 builtin/pull.c:149
17933 msgid "create a single commit instead of doing a merge"
17934 msgstr "skapa en ensam incheckning istället för en sammanslagning"
17935
17936 -#: builtin/merge.c:268 builtin/pull.c:151
17936 +#: builtin/merge.c:268 builtin/pull.c:152
17937 msgid "perform a commit if the merge succeeds (default)"
17938 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
17939
17940 -#: builtin/merge.c:270 builtin/pull.c:154
17940 +#: builtin/merge.c:270 builtin/pull.c:155
17941 msgid "edit message before committing"
17942 msgstr "redigera meddelande innan incheckning"
17943
@@ -17945,28 +17945,28 @@ msgstr "redigera meddelande innan incheckning"
17945 msgid "allow fast-forward (default)"
17946 msgstr "tillåt snabbspolning (standard)"
17947
17948 -#: builtin/merge.c:274 builtin/pull.c:161
17948 +#: builtin/merge.c:274 builtin/pull.c:162
17949 msgid "abort if fast-forward is not possible"
17950 msgstr "avbryt om snabbspolning inte är möjlig"
17951
17952 -#: builtin/merge.c:278 builtin/pull.c:164
17952 +#: builtin/merge.c:278 builtin/pull.c:168
17953 msgid "verify that the named commit has a valid GPG signature"
17954 msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
17955
17956 -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
17956 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
17957 #: builtin/rebase.c:1117 builtin/revert.c:114
17958 msgid "strategy"
17959 msgstr "strategi"
17960
17961 -#: builtin/merge.c:280 builtin/pull.c:169
17961 +#: builtin/merge.c:280 builtin/pull.c:173
17962 msgid "merge strategy to use"
17963 msgstr "sammanslagningsstrategi att använda"
17964
17965 -#: builtin/merge.c:281 builtin/pull.c:172
17965 +#: builtin/merge.c:281 builtin/pull.c:176
17966 msgid "option=value"
17967 msgstr "alternativ=värde"
17968
17969 -#: builtin/merge.c:282 builtin/pull.c:173
17969 +#: builtin/merge.c:282 builtin/pull.c:177
17970 msgid "option for selected merge strategy"
17971 msgstr "alternativ för vald sammanslagningsstrategi"
17972
@@ -17986,7 +17986,7 @@ msgstr "--abort men lämna index och arbetskatalog ensamma"
17986 msgid "continue the current in-progress merge"
17987 msgstr "fortsätt den pågående sammanslagningen"
17988
17989 -#: builtin/merge.c:297 builtin/pull.c:180
17989 +#: builtin/merge.c:297 builtin/pull.c:184
17990 msgid "allow merging unrelated histories"
17991 msgstr "tillåt sammanslagning av orelaterade historier"
17992
@@ -19397,44 +19397,48 @@ msgstr "Felaktigt värde för %s: %s"
19397 msgid "git pull [<options>] [<repository> [<refspec>...]]"
19398 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
19399
19400 -#: builtin/pull.c:123
19400 +#: builtin/pull.c:124
19401 msgid "control for recursive fetching of submodules"
19402 msgstr "styrning för rekursiv hämtning av undermoduler"
19403
19404 -#: builtin/pull.c:127
19404 +#: builtin/pull.c:128
19405 msgid "Options related to merging"
19406 msgstr "Alternativ gällande sammanslagning"
19407
19408 -#: builtin/pull.c:130
19408 +#: builtin/pull.c:131
19409 msgid "incorporate changes by rebasing rather than merging"
19410 msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
19411
19412 -#: builtin/pull.c:158 builtin/revert.c:126
19412 +#: builtin/pull.c:159 builtin/revert.c:126
19413 msgid "allow fast-forward"
19414 msgstr "tillåt snabbspolning"
19415
19416 -#: builtin/pull.c:167 parse-options.h:339
19416 +#: builtin/pull.c:165
19417 +msgid "control use of pre-merge-commit and commit-msg hooks"
19418 +msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
19419 +
19420 +#: builtin/pull.c:171 parse-options.h:338
19421 msgid "automatically stash/stash pop before and after"
19422 msgstr "utför automatiskt stash/stash pop före och efter"
19423
19420 -#: builtin/pull.c:183
19424 +#: builtin/pull.c:187
19425 msgid "Options related to fetching"
19426 msgstr "Alternativ gällande hämtningar"
19427
19424 -#: builtin/pull.c:193
19428 +#: builtin/pull.c:197
19429 msgid "force overwrite of local branch"
19430 msgstr "tvinga överskrivning av lokal gren"
19431
19428 -#: builtin/pull.c:201
19432 +#: builtin/pull.c:205
19433 msgid "number of submodules pulled in parallel"
19434 msgstr "antal undermoduler som hämtas parallellt"
19435
19432 -#: builtin/pull.c:317
19436 +#: builtin/pull.c:321
19437 #, c-format
19438 msgid "Invalid value for pull.ff: %s"
19439 msgstr "Felaktigt värde för pull.ff: %s"
19440
19437 -#: builtin/pull.c:445
19441 +#: builtin/pull.c:449
19442 msgid ""
19443 "There is no candidate for rebasing against among the refs that you just "
19444 "fetched."
@@ -19442,14 +19446,14 @@ msgstr ""
19446 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
19447 "hämtat."
19448
19445 -#: builtin/pull.c:447
19449 +#: builtin/pull.c:451
19450 msgid ""
19451 "There are no candidates for merging among the refs that you just fetched."
19452 msgstr ""
19453 "Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
19454 "hämtat."
19455
19452 -#: builtin/pull.c:448
19456 +#: builtin/pull.c:452
19457 msgid ""
19458 "Generally this means that you provided a wildcard refspec which had no\n"
19459 "matches on the remote end."
@@ -19457,7 +19461,7 @@ msgstr ""
19461 "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
19462 "motsvarade något i fjärränden."
19463
19460 -#: builtin/pull.c:451
19464 +#: builtin/pull.c:455
19465 #, c-format
19466 msgid ""
19467 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19468,41 +19472,41 @@ msgstr ""
19472 "gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
19473 "standard för aktuell gren måste du ange en gren på kommandoraden."
19474
19471 -#: builtin/pull.c:456 builtin/rebase.c:951
19475 +#: builtin/pull.c:460 builtin/rebase.c:951
19476 msgid "You are not currently on a branch."
19477 msgstr "Du är inte på någon gren för närvarande."
19478
19475 -#: builtin/pull.c:458 builtin/pull.c:473
19479 +#: builtin/pull.c:462 builtin/pull.c:477
19480 msgid "Please specify which branch you want to rebase against."
19481 msgstr "Ange vilken gren du vill ombasera mot."
19482
19479 -#: builtin/pull.c:460 builtin/pull.c:475
19483 +#: builtin/pull.c:464 builtin/pull.c:479
19484 msgid "Please specify which branch you want to merge with."
19485 msgstr "Ange vilken gren du vill slå samman med."
19486
19483 -#: builtin/pull.c:461 builtin/pull.c:476
19487 +#: builtin/pull.c:465 builtin/pull.c:480
19488 msgid "See git-pull(1) for details."
19489 msgstr "Se git-pull(1) för detaljer."
19490
19487 -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
19491 +#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
19492 #: builtin/rebase.c:957
19493 msgid "<remote>"
19494 msgstr "<fjärr>"
19495
19492 -#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
19496 +#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
19497 msgid "<branch>"
19498 msgstr "<gren>"
19499
19496 -#: builtin/pull.c:471 builtin/rebase.c:949
19500 +#: builtin/pull.c:475 builtin/rebase.c:949
19501 msgid "There is no tracking information for the current branch."
19502 msgstr "Det finns ingen spårningsinformation för aktuell gren."
19503
19500 -#: builtin/pull.c:480
19504 +#: builtin/pull.c:484
19505 msgid ""
19506 "If you wish to set tracking information for this branch you can do so with:"
19507 msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
19508
19505 -#: builtin/pull.c:485
19509 +#: builtin/pull.c:489
19510 #, c-format
19511 msgid ""
19512 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19511,16 +19515,16 @@ msgstr ""
19515 "Dina inställningar anger sammanslagning med referensen \"%s\"\n"
19516 "från fjärren, men någon sådan referens togs inte emot."
19517
19514 -#: builtin/pull.c:596
19518 +#: builtin/pull.c:600
19519 #, c-format
19520 msgid "unable to access commit %s"
19521 msgstr "kunde inte komma åt incheckningen %s"
19522
19519 -#: builtin/pull.c:902
19523 +#: builtin/pull.c:908
19524 msgid "ignoring --verify-signatures for rebase"
19525 msgstr "ignorera --verify-signatures för ombasering"
19526
19523 -#: builtin/pull.c:936
19527 +#: builtin/pull.c:942
19528 msgid ""
19529 "You have divergent branches and need to specify how to reconcile them.\n"
19530 "You can do so by running one of the following commands sometime before\n"
@@ -19549,19 +19553,19 @@ msgstr ""
19553 "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
19554 "förvalet vid körning.\n"
19555
19552 -#: builtin/pull.c:1010
19556 +#: builtin/pull.c:1016
19557 msgid "Updating an unborn branch with changes added to the index."
19558 msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
19559
19556 -#: builtin/pull.c:1014
19560 +#: builtin/pull.c:1020
19561 msgid "pull with rebase"
19562 msgstr "pull med ombasering"
19563
19560 -#: builtin/pull.c:1015
19564 +#: builtin/pull.c:1021
19565 msgid "please commit or stash them."
19566 msgstr "checka in eller använd \"stash\" på dem."
19567
19564 -#: builtin/pull.c:1040
19568 +#: builtin/pull.c:1046
19569 #, c-format
19570 msgid ""
19571 "fetch updated the current branch head.\n"
@@ -19572,7 +19576,7 @@ msgstr ""
19576 "snabbspolar din arbetskatalog från\n"
19577 "incheckningen %s."
19578
19575 -#: builtin/pull.c:1046
19579 +#: builtin/pull.c:1052
19580 #, c-format
19581 msgid ""
19582 "Cannot fast-forward your working tree.\n"
@@ -19589,23 +19593,23 @@ msgstr ""
19593 "$ git reset --hard\n"
19594 "för att återgå."
19595
19592 -#: builtin/pull.c:1061
19596 +#: builtin/pull.c:1067
19597 msgid "Cannot merge multiple branches into empty head."
19598 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
19599
19596 -#: builtin/pull.c:1066
19600 +#: builtin/pull.c:1072
19601 msgid "Cannot rebase onto multiple branches."
19602 msgstr "Kan inte ombasera ovanpå flera grenar."
19603
19600 -#: builtin/pull.c:1068
19604 +#: builtin/pull.c:1074
19605 msgid "Cannot fast-forward to multiple branches."
19606 msgstr "Kan inte snabbspola till flera grenar."
19607
19604 -#: builtin/pull.c:1082
19608 +#: builtin/pull.c:1088
19609 msgid "Need to specify how to reconcile divergent branches."
19610 msgstr "Måste ange hur avvikande grenar skall förlikas."
19611
19608 -#: builtin/pull.c:1096
19612 +#: builtin/pull.c:1102
19613 msgid "cannot rebase with locally recorded submodule modifications"
19614 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
19615
@@ -24729,27 +24733,27 @@ msgstr "giltig-till"
24733 msgid "no-op (backward compatibility)"
24734 msgstr "ingen funktion (bakåtkompatibilitet)"
24735
24732 -#: parse-options.h:309
24736 +#: parse-options.h:308
24737 msgid "be more verbose"
24738 msgstr "var mer pratsam"
24739
24736 -#: parse-options.h:311
24740 +#: parse-options.h:310
24741 msgid "be more quiet"
24742 msgstr "var mer tyst"
24743
24740 -#: parse-options.h:317
24744 +#: parse-options.h:316
24745 msgid "use <n> digits to display object names"
24746 msgstr "använd <n> siffror för att visa objektnamn"
24747
24744 -#: parse-options.h:336
24748 +#: parse-options.h:335
24749 msgid "how to strip spaces and #comments from message"
24750 msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
24751
24748 -#: parse-options.h:337
24752 +#: parse-options.h:336
24753 msgid "read pathspec from file"
24754 msgstr "läs sökvägsangivelse från fil"
24755
24752 -#: parse-options.h:338
24756 +#: parse-options.h:337
24757 msgid ""
24758 "with --pathspec-from-file, pathspec elements are separated with NUL character"
24759 msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"