l10n: sv.po: Update Swedish translation (5211t0f0)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
This commit is contained in:
Peter Krefting
parent
143b963b60
commit
f29b823c3a
190
po/sv.po
190
po/sv.po
@ -7,8 +7,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git 2.34.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2021-11-04 08:34+0800\n"
|
||||
"PO-Revision-Date: 2021-11-04 20:44+0100\n"
|
||||
"POT-Creation-Date: 2021-11-10 08:55+0800\n"
|
||||
"PO-Revision-Date: 2021-11-11 23:20+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language: sv\n"
|
||||
@ -211,7 +211,7 @@ msgstr "ej köad"
|
||||
|
||||
#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
|
||||
#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
|
||||
#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
|
||||
#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
|
||||
#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
|
||||
#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
|
||||
#: 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"
|
||||
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
||||
|
||||
#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
|
||||
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
|
||||
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
|
||||
#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
|
||||
msgid "dry run"
|
||||
msgstr "testkörning"
|
||||
@ -10890,11 +10890,11 @@ msgstr "sänd det genom git-apply"
|
||||
|
||||
#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
|
||||
#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
|
||||
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
|
||||
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
|
||||
#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
|
||||
#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
|
||||
#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
|
||||
#: parse-options.h:316
|
||||
#: parse-options.h:315
|
||||
msgid "n"
|
||||
msgstr "n"
|
||||
|
||||
@ -10945,7 +10945,7 @@ msgid "use current timestamp for author date"
|
||||
msgstr "använd nuvarande tidsstämpel för författardatum"
|
||||
|
||||
#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
|
||||
#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
|
||||
#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
|
||||
#: builtin/revert.c:117 builtin/tag.c:460
|
||||
msgid "key-id"
|
||||
msgstr "nyckel-id"
|
||||
@ -11452,7 +11452,7 @@ msgstr "visa statistik över arbetskostnad"
|
||||
#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
|
||||
#: builtin/merge.c:298 builtin/multi-pack-index.c:103
|
||||
#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
|
||||
#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
|
||||
#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
|
||||
#: builtin/send-pack.c:202
|
||||
msgid "force progress reporting"
|
||||
msgstr "tvinga förloppsrapportering"
|
||||
@ -12721,7 +12721,7 @@ msgstr "saknar gren- eller incheckingsargument"
|
||||
msgid "perform a 3-way merge with the new branch"
|
||||
msgstr "utför en 3-vägssammanslagning för den nya grenen"
|
||||
|
||||
#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
|
||||
#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
|
||||
msgid "style"
|
||||
msgstr "stil"
|
||||
|
||||
@ -13149,7 +13149,7 @@ msgid "path to git-upload-pack on the remote"
|
||||
msgstr "sökväg till git-upload-pack på fjärren"
|
||||
|
||||
#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
|
||||
#: builtin/pull.c:208
|
||||
#: builtin/pull.c:212
|
||||
msgid "depth"
|
||||
msgstr "djup"
|
||||
|
||||
@ -13158,7 +13158,7 @@ msgid "create a shallow clone of that depth"
|
||||
msgstr "skapa en grund klon på detta djup"
|
||||
|
||||
#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
|
||||
#: builtin/pull.c:211
|
||||
#: builtin/pull.c:215
|
||||
msgid "time"
|
||||
msgstr "tid"
|
||||
|
||||
@ -13167,11 +13167,11 @@ msgid "create a shallow clone since a specific time"
|
||||
msgstr "skapa en grund klon från en angiven tidpunkt"
|
||||
|
||||
#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
|
||||
#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
|
||||
#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
|
||||
msgid "revision"
|
||||
msgstr "revision"
|
||||
|
||||
#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
|
||||
#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
|
||||
msgid "deepen history of shallow clone, excluding rev"
|
||||
msgstr "fördjupa historik för grund klon, exkludera revisionen"
|
||||
|
||||
@ -13205,23 +13205,23 @@ msgid "set config inside the new repository"
|
||||
msgstr "ställ in konfiguration i det nya arkivet"
|
||||
|
||||
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
|
||||
#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
|
||||
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
|
||||
msgid "server-specific"
|
||||
msgstr "serverspecifik"
|
||||
|
||||
#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
|
||||
#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
|
||||
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
|
||||
msgid "option to transmit"
|
||||
msgstr ""
|
||||
"inget att checka in\n"
|
||||
"flagga att sända"
|
||||
|
||||
#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
|
||||
#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
|
||||
#: builtin/push.c:576
|
||||
msgid "use IPv4 addresses only"
|
||||
msgstr "använd endast IPv4-adresser"
|
||||
|
||||
#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
|
||||
#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
|
||||
#: builtin/push.c:578
|
||||
msgid "use IPv6 addresses only"
|
||||
msgstr "använd endast IPv6-adresser"
|
||||
@ -13612,7 +13612,7 @@ msgid "read commit log message from file"
|
||||
msgstr "läs incheckningsloggmeddelande från fil"
|
||||
|
||||
#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
|
||||
#: builtin/pull.c:176 builtin/revert.c:118
|
||||
#: builtin/pull.c:180 builtin/revert.c:118
|
||||
msgid "GPG sign commit"
|
||||
msgstr "GPG-signera incheckning"
|
||||
|
||||
@ -14023,7 +14023,7 @@ msgstr "terminera poster med NUL"
|
||||
|
||||
#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
|
||||
#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
|
||||
#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
|
||||
#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
|
||||
msgid "mode"
|
||||
msgstr "läge"
|
||||
|
||||
@ -14100,7 +14100,7 @@ msgid "override date for commit"
|
||||
msgstr "överstyr datum för incheckningen"
|
||||
|
||||
#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
|
||||
#: parse-options.h:328 ref-filter.h:92
|
||||
#: parse-options.h:327 ref-filter.h:92
|
||||
msgid "commit"
|
||||
msgstr "incheckning"
|
||||
|
||||
@ -14145,7 +14145,7 @@ msgid "add custom trailer(s)"
|
||||
msgstr "använd skräddarsydd(a) släprad(er)"
|
||||
|
||||
#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
|
||||
#: builtin/pull.c:145 builtin/revert.c:110
|
||||
#: builtin/pull.c:146 builtin/revert.c:110
|
||||
msgid "add a Signed-off-by trailer"
|
||||
msgstr "lägg till Signed-off-by-släprad"
|
||||
|
||||
@ -15121,15 +15121,15 @@ msgstr "git fetch --all [<flaggor>]"
|
||||
msgid "fetch.parallel cannot be negative"
|
||||
msgstr "fetch.parallel kan inte vara negativt"
|
||||
|
||||
#: builtin/fetch.c:145 builtin/pull.c:185
|
||||
#: builtin/fetch.c:145 builtin/pull.c:189
|
||||
msgid "fetch from all remotes"
|
||||
msgstr "hämta från alla fjärrar"
|
||||
|
||||
#: builtin/fetch.c:147 builtin/pull.c:245
|
||||
#: builtin/fetch.c:147 builtin/pull.c:249
|
||||
msgid "set upstream for git pull/fetch"
|
||||
msgstr "ställ in uppström för git pull/fetch"
|
||||
|
||||
#: builtin/fetch.c:149 builtin/pull.c:188
|
||||
#: builtin/fetch.c:149 builtin/pull.c:192
|
||||
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
||||
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
|
||||
|
||||
@ -15137,7 +15137,7 @@ msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
|
||||
msgid "use atomic transaction to update references"
|
||||
msgstr "använd atomiska transaktioner för att uppdatera referenser"
|
||||
|
||||
#: builtin/fetch.c:153 builtin/pull.c:191
|
||||
#: builtin/fetch.c:153 builtin/pull.c:195
|
||||
msgid "path to upload pack on remote end"
|
||||
msgstr "sökväg till upload pack på fjärren"
|
||||
|
||||
@ -15149,7 +15149,7 @@ msgstr "tvinga överskrivning av lokal referens"
|
||||
msgid "fetch from multiple remotes"
|
||||
msgstr "hämta från flera fjärrar"
|
||||
|
||||
#: builtin/fetch.c:158 builtin/pull.c:195
|
||||
#: builtin/fetch.c:158 builtin/pull.c:199
|
||||
msgid "fetch all tags and associated objects"
|
||||
msgstr "hämta alla taggar och associerade objekt"
|
||||
|
||||
@ -15167,7 +15167,7 @@ msgstr ""
|
||||
"modifiera referensspecifikationen så att alla referenser hamnar i refs/"
|
||||
"prefetch/"
|
||||
|
||||
#: builtin/fetch.c:166 builtin/pull.c:198
|
||||
#: builtin/fetch.c:166 builtin/pull.c:202
|
||||
msgid "prune remote-tracking branches no longer on remote"
|
||||
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
|
||||
|
||||
@ -15176,7 +15176,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"
|
||||
msgstr ""
|
||||
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
|
||||
|
||||
#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
|
||||
#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
|
||||
msgid "on-demand"
|
||||
msgstr "on-demand"
|
||||
|
||||
@ -15188,7 +15188,7 @@ msgstr "styr rekursiv hämtning av undermoduler"
|
||||
msgid "write fetched references to the FETCH_HEAD file"
|
||||
msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
|
||||
|
||||
#: builtin/fetch.c:176 builtin/pull.c:206
|
||||
#: builtin/fetch.c:176 builtin/pull.c:210
|
||||
msgid "keep downloaded pack"
|
||||
msgstr "behåll hämtade paket"
|
||||
|
||||
@ -15196,16 +15196,16 @@ msgstr "behåll hämtade paket"
|
||||
msgid "allow updating of HEAD ref"
|
||||
msgstr "tillåt uppdatering av HEAD-referens"
|
||||
|
||||
#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
|
||||
#: builtin/pull.c:218
|
||||
#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
|
||||
#: builtin/pull.c:222
|
||||
msgid "deepen history of shallow clone"
|
||||
msgstr "fördjupa historik för grund klon"
|
||||
|
||||
#: builtin/fetch.c:183 builtin/pull.c:212
|
||||
#: builtin/fetch.c:183 builtin/pull.c:216
|
||||
msgid "deepen history of shallow repository based on time"
|
||||
msgstr "fördjupa historik för grund klon baserad på tid"
|
||||
|
||||
#: builtin/fetch.c:189 builtin/pull.c:221
|
||||
#: builtin/fetch.c:189 builtin/pull.c:225
|
||||
msgid "convert to a complete repository"
|
||||
msgstr "konvertera till komplett arkiv"
|
||||
|
||||
@ -15221,19 +15221,19 @@ msgstr ""
|
||||
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
|
||||
"konfigurationsfiler)"
|
||||
|
||||
#: builtin/fetch.c:199 builtin/pull.c:224
|
||||
#: builtin/fetch.c:199 builtin/pull.c:228
|
||||
msgid "accept refs that update .git/shallow"
|
||||
msgstr "tar emot referenser som uppdaterar .git/shallow"
|
||||
|
||||
#: builtin/fetch.c:200 builtin/pull.c:226
|
||||
#: builtin/fetch.c:200 builtin/pull.c:230
|
||||
msgid "refmap"
|
||||
msgstr "referenskarta"
|
||||
|
||||
#: builtin/fetch.c:201 builtin/pull.c:227
|
||||
#: builtin/fetch.c:201 builtin/pull.c:231
|
||||
msgid "specify fetch refmap"
|
||||
msgstr "ange referenskarta för \"fetch\""
|
||||
|
||||
#: builtin/fetch.c:208 builtin/pull.c:240
|
||||
#: builtin/fetch.c:208 builtin/pull.c:244
|
||||
msgid "report that we have only objects reachable from this object"
|
||||
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
|
||||
|
||||
@ -15245,7 +15245,7 @@ msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
|
||||
msgid "run 'maintenance --auto' after fetching"
|
||||
msgstr "kör \"maintenance --auto\" efter hämtning"
|
||||
|
||||
#: builtin/fetch.c:217 builtin/pull.c:243
|
||||
#: builtin/fetch.c:217 builtin/pull.c:247
|
||||
msgid "check for forced-updates on all updated branches"
|
||||
msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
|
||||
|
||||
@ -17912,32 +17912,32 @@ msgstr "Tillgängliga strategier är:"
|
||||
msgid "Available custom strategies are:"
|
||||
msgstr "Tillgängliga skräddarsydda strategier är:"
|
||||
|
||||
#: builtin/merge.c:257 builtin/pull.c:133
|
||||
#: builtin/merge.c:257 builtin/pull.c:134
|
||||
msgid "do not show a diffstat at the end of the merge"
|
||||
msgstr "visa inte en diffstat när sammanslagningen är färdig"
|
||||
|
||||
#: builtin/merge.c:260 builtin/pull.c:136
|
||||
#: builtin/merge.c:260 builtin/pull.c:137
|
||||
msgid "show a diffstat at the end of the merge"
|
||||
msgstr "visa en diffstat när sammanslagningen är färdig"
|
||||
|
||||
#: builtin/merge.c:261 builtin/pull.c:139
|
||||
#: builtin/merge.c:261 builtin/pull.c:140
|
||||
msgid "(synonym to --stat)"
|
||||
msgstr "(synonym till --stat)"
|
||||
|
||||
#: builtin/merge.c:263 builtin/pull.c:142
|
||||
#: builtin/merge.c:263 builtin/pull.c:143
|
||||
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
||||
msgstr ""
|
||||
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
|
||||
|
||||
#: builtin/merge.c:266 builtin/pull.c:148
|
||||
#: builtin/merge.c:266 builtin/pull.c:149
|
||||
msgid "create a single commit instead of doing a merge"
|
||||
msgstr "skapa en ensam incheckning istället för en sammanslagning"
|
||||
|
||||
#: builtin/merge.c:268 builtin/pull.c:151
|
||||
#: builtin/merge.c:268 builtin/pull.c:152
|
||||
msgid "perform a commit if the merge succeeds (default)"
|
||||
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
|
||||
|
||||
#: builtin/merge.c:270 builtin/pull.c:154
|
||||
#: builtin/merge.c:270 builtin/pull.c:155
|
||||
msgid "edit message before committing"
|
||||
msgstr "redigera meddelande innan incheckning"
|
||||
|
||||
@ -17945,28 +17945,28 @@ msgstr "redigera meddelande innan incheckning"
|
||||
msgid "allow fast-forward (default)"
|
||||
msgstr "tillåt snabbspolning (standard)"
|
||||
|
||||
#: builtin/merge.c:274 builtin/pull.c:161
|
||||
#: builtin/merge.c:274 builtin/pull.c:162
|
||||
msgid "abort if fast-forward is not possible"
|
||||
msgstr "avbryt om snabbspolning inte är möjlig"
|
||||
|
||||
#: builtin/merge.c:278 builtin/pull.c:164
|
||||
#: builtin/merge.c:278 builtin/pull.c:168
|
||||
msgid "verify that the named commit has a valid GPG signature"
|
||||
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
|
||||
|
||||
#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
|
||||
#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
|
||||
#: builtin/rebase.c:1117 builtin/revert.c:114
|
||||
msgid "strategy"
|
||||
msgstr "strategi"
|
||||
|
||||
#: builtin/merge.c:280 builtin/pull.c:169
|
||||
#: builtin/merge.c:280 builtin/pull.c:173
|
||||
msgid "merge strategy to use"
|
||||
msgstr "sammanslagningsstrategi att använda"
|
||||
|
||||
#: builtin/merge.c:281 builtin/pull.c:172
|
||||
#: builtin/merge.c:281 builtin/pull.c:176
|
||||
msgid "option=value"
|
||||
msgstr "alternativ=värde"
|
||||
|
||||
#: builtin/merge.c:282 builtin/pull.c:173
|
||||
#: builtin/merge.c:282 builtin/pull.c:177
|
||||
msgid "option for selected merge strategy"
|
||||
msgstr "alternativ för vald sammanslagningsstrategi"
|
||||
|
||||
@ -17986,7 +17986,7 @@ msgstr "--abort men lämna index och arbetskatalog ensamma"
|
||||
msgid "continue the current in-progress merge"
|
||||
msgstr "fortsätt den pågående sammanslagningen"
|
||||
|
||||
#: builtin/merge.c:297 builtin/pull.c:180
|
||||
#: builtin/merge.c:297 builtin/pull.c:184
|
||||
msgid "allow merging unrelated histories"
|
||||
msgstr "tillåt sammanslagning av orelaterade historier"
|
||||
|
||||
@ -19397,44 +19397,48 @@ msgstr "Felaktigt värde för %s: %s"
|
||||
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
|
||||
|
||||
#: builtin/pull.c:123
|
||||
#: builtin/pull.c:124
|
||||
msgid "control for recursive fetching of submodules"
|
||||
msgstr "styrning för rekursiv hämtning av undermoduler"
|
||||
|
||||
#: builtin/pull.c:127
|
||||
#: builtin/pull.c:128
|
||||
msgid "Options related to merging"
|
||||
msgstr "Alternativ gällande sammanslagning"
|
||||
|
||||
#: builtin/pull.c:130
|
||||
#: builtin/pull.c:131
|
||||
msgid "incorporate changes by rebasing rather than merging"
|
||||
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
|
||||
|
||||
#: builtin/pull.c:158 builtin/revert.c:126
|
||||
#: builtin/pull.c:159 builtin/revert.c:126
|
||||
msgid "allow fast-forward"
|
||||
msgstr "tillåt snabbspolning"
|
||||
|
||||
#: builtin/pull.c:167 parse-options.h:339
|
||||
#: builtin/pull.c:165
|
||||
msgid "control use of pre-merge-commit and commit-msg hooks"
|
||||
msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
|
||||
|
||||
#: builtin/pull.c:171 parse-options.h:338
|
||||
msgid "automatically stash/stash pop before and after"
|
||||
msgstr "utför automatiskt stash/stash pop före och efter"
|
||||
|
||||
#: builtin/pull.c:183
|
||||
#: builtin/pull.c:187
|
||||
msgid "Options related to fetching"
|
||||
msgstr "Alternativ gällande hämtningar"
|
||||
|
||||
#: builtin/pull.c:193
|
||||
#: builtin/pull.c:197
|
||||
msgid "force overwrite of local branch"
|
||||
msgstr "tvinga överskrivning av lokal gren"
|
||||
|
||||
#: builtin/pull.c:201
|
||||
#: builtin/pull.c:205
|
||||
msgid "number of submodules pulled in parallel"
|
||||
msgstr "antal undermoduler som hämtas parallellt"
|
||||
|
||||
#: builtin/pull.c:317
|
||||
#: builtin/pull.c:321
|
||||
#, c-format
|
||||
msgid "Invalid value for pull.ff: %s"
|
||||
msgstr "Felaktigt värde för pull.ff: %s"
|
||||
|
||||
#: builtin/pull.c:445
|
||||
#: builtin/pull.c:449
|
||||
msgid ""
|
||||
"There is no candidate for rebasing against among the refs that you just "
|
||||
"fetched."
|
||||
@ -19442,14 +19446,14 @@ msgstr ""
|
||||
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
|
||||
"hämtat."
|
||||
|
||||
#: builtin/pull.c:447
|
||||
#: builtin/pull.c:451
|
||||
msgid ""
|
||||
"There are no candidates for merging among the refs that you just fetched."
|
||||
msgstr ""
|
||||
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
|
||||
"hämtat."
|
||||
|
||||
#: builtin/pull.c:448
|
||||
#: builtin/pull.c:452
|
||||
msgid ""
|
||||
"Generally this means that you provided a wildcard refspec which had no\n"
|
||||
"matches on the remote end."
|
||||
@ -19457,7 +19461,7 @@ msgstr ""
|
||||
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
|
||||
"motsvarade något i fjärränden."
|
||||
|
||||
#: builtin/pull.c:451
|
||||
#: builtin/pull.c:455
|
||||
#, c-format
|
||||
msgid ""
|
||||
"You asked to pull from the remote '%s', but did not specify\n"
|
||||
@ -19468,41 +19472,41 @@ msgstr ""
|
||||
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
|
||||
"standard för aktuell gren måste du ange en gren på kommandoraden."
|
||||
|
||||
#: builtin/pull.c:456 builtin/rebase.c:951
|
||||
#: builtin/pull.c:460 builtin/rebase.c:951
|
||||
msgid "You are not currently on a branch."
|
||||
msgstr "Du är inte på någon gren för närvarande."
|
||||
|
||||
#: builtin/pull.c:458 builtin/pull.c:473
|
||||
#: builtin/pull.c:462 builtin/pull.c:477
|
||||
msgid "Please specify which branch you want to rebase against."
|
||||
msgstr "Ange vilken gren du vill ombasera mot."
|
||||
|
||||
#: builtin/pull.c:460 builtin/pull.c:475
|
||||
#: builtin/pull.c:464 builtin/pull.c:479
|
||||
msgid "Please specify which branch you want to merge with."
|
||||
msgstr "Ange vilken gren du vill slå samman med."
|
||||
|
||||
#: builtin/pull.c:461 builtin/pull.c:476
|
||||
#: builtin/pull.c:465 builtin/pull.c:480
|
||||
msgid "See git-pull(1) for details."
|
||||
msgstr "Se git-pull(1) för detaljer."
|
||||
|
||||
#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
|
||||
#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
|
||||
#: builtin/rebase.c:957
|
||||
msgid "<remote>"
|
||||
msgstr "<fjärr>"
|
||||
|
||||
#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
|
||||
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
|
||||
msgid "<branch>"
|
||||
msgstr "<gren>"
|
||||
|
||||
#: builtin/pull.c:471 builtin/rebase.c:949
|
||||
#: builtin/pull.c:475 builtin/rebase.c:949
|
||||
msgid "There is no tracking information for the current branch."
|
||||
msgstr "Det finns ingen spårningsinformation för aktuell gren."
|
||||
|
||||
#: builtin/pull.c:480
|
||||
#: builtin/pull.c:484
|
||||
msgid ""
|
||||
"If you wish to set tracking information for this branch you can do so with:"
|
||||
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
|
||||
|
||||
#: builtin/pull.c:485
|
||||
#: builtin/pull.c:489
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your configuration specifies to merge with the ref '%s'\n"
|
||||
@ -19511,16 +19515,16 @@ msgstr ""
|
||||
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
|
||||
"från fjärren, men någon sådan referens togs inte emot."
|
||||
|
||||
#: builtin/pull.c:596
|
||||
#: builtin/pull.c:600
|
||||
#, c-format
|
||||
msgid "unable to access commit %s"
|
||||
msgstr "kunde inte komma åt incheckningen %s"
|
||||
|
||||
#: builtin/pull.c:902
|
||||
#: builtin/pull.c:908
|
||||
msgid "ignoring --verify-signatures for rebase"
|
||||
msgstr "ignorera --verify-signatures för ombasering"
|
||||
|
||||
#: builtin/pull.c:936
|
||||
#: builtin/pull.c:942
|
||||
msgid ""
|
||||
"You have divergent branches and need to specify how to reconcile them.\n"
|
||||
"You can do so by running one of the following commands sometime before\n"
|
||||
@ -19549,19 +19553,19 @@ msgstr ""
|
||||
"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
|
||||
"förvalet vid körning.\n"
|
||||
|
||||
#: builtin/pull.c:1010
|
||||
#: builtin/pull.c:1016
|
||||
msgid "Updating an unborn branch with changes added to the index."
|
||||
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
|
||||
|
||||
#: builtin/pull.c:1014
|
||||
#: builtin/pull.c:1020
|
||||
msgid "pull with rebase"
|
||||
msgstr "pull med ombasering"
|
||||
|
||||
#: builtin/pull.c:1015
|
||||
#: builtin/pull.c:1021
|
||||
msgid "please commit or stash them."
|
||||
msgstr "checka in eller använd \"stash\" på dem."
|
||||
|
||||
#: builtin/pull.c:1040
|
||||
#: builtin/pull.c:1046
|
||||
#, c-format
|
||||
msgid ""
|
||||
"fetch updated the current branch head.\n"
|
||||
@ -19572,7 +19576,7 @@ msgstr ""
|
||||
"snabbspolar din arbetskatalog från\n"
|
||||
"incheckningen %s."
|
||||
|
||||
#: builtin/pull.c:1046
|
||||
#: builtin/pull.c:1052
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Cannot fast-forward your working tree.\n"
|
||||
@ -19589,23 +19593,23 @@ msgstr ""
|
||||
"$ git reset --hard\n"
|
||||
"för att återgå."
|
||||
|
||||
#: builtin/pull.c:1061
|
||||
#: builtin/pull.c:1067
|
||||
msgid "Cannot merge multiple branches into empty head."
|
||||
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
|
||||
|
||||
#: builtin/pull.c:1066
|
||||
#: builtin/pull.c:1072
|
||||
msgid "Cannot rebase onto multiple branches."
|
||||
msgstr "Kan inte ombasera ovanpå flera grenar."
|
||||
|
||||
#: builtin/pull.c:1068
|
||||
#: builtin/pull.c:1074
|
||||
msgid "Cannot fast-forward to multiple branches."
|
||||
msgstr "Kan inte snabbspola till flera grenar."
|
||||
|
||||
#: builtin/pull.c:1082
|
||||
#: builtin/pull.c:1088
|
||||
msgid "Need to specify how to reconcile divergent branches."
|
||||
msgstr "Måste ange hur avvikande grenar skall förlikas."
|
||||
|
||||
#: builtin/pull.c:1096
|
||||
#: builtin/pull.c:1102
|
||||
msgid "cannot rebase with locally recorded submodule modifications"
|
||||
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
|
||||
|
||||
@ -24729,27 +24733,27 @@ msgstr "giltig-till"
|
||||
msgid "no-op (backward compatibility)"
|
||||
msgstr "ingen funktion (bakåtkompatibilitet)"
|
||||
|
||||
#: parse-options.h:309
|
||||
#: parse-options.h:308
|
||||
msgid "be more verbose"
|
||||
msgstr "var mer pratsam"
|
||||
|
||||
#: parse-options.h:311
|
||||
#: parse-options.h:310
|
||||
msgid "be more quiet"
|
||||
msgstr "var mer tyst"
|
||||
|
||||
#: parse-options.h:317
|
||||
#: parse-options.h:316
|
||||
msgid "use <n> digits to display object names"
|
||||
msgstr "använd <n> siffror för att visa objektnamn"
|
||||
|
||||
#: parse-options.h:336
|
||||
#: parse-options.h:335
|
||||
msgid "how to strip spaces and #comments from message"
|
||||
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
|
||||
|
||||
#: parse-options.h:337
|
||||
#: parse-options.h:336
|
||||
msgid "read pathspec from file"
|
||||
msgstr "läs sökvägsangivelse från fil"
|
||||
|
||||
#: parse-options.h:338
|
||||
#: parse-options.h:337
|
||||
msgid ""
|
||||
"with --pathspec-from-file, pathspec elements are separated with NUL character"
|
||||
msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user