mirror of
https://github.com/git/git.git
synced 2024-05-27 12:16:10 +02:00
l10n: sv.po: Update Swedish translation (4839t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
This commit is contained in:
Peter Krefting
parent
440e7442d1
commit
d7d8b208da
594
po/sv.po
594
po/sv.po
|
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 2.26.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2020-03-06 14:25+0800\n"
|
||||
"PO-Revision-Date: 2020-03-09 20:54+0100\n"
|
||||
"POT-Creation-Date: 2020-03-11 15:26+0800\n"
|
||||
"PO-Revision-Date: 2020-03-17 18:30+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
"Language: sv\n"
|
||||
|
|
@ -210,8 +210,8 @@ msgstr "köad"
|
|||
msgid "unstaged"
|
||||
msgstr "ej köad"
|
||||
|
||||
#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
|
||||
#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
|
||||
#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
|
||||
#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
|
||||
#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
|
||||
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
|
||||
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
|
||||
|
|
@ -1307,7 +1307,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."
|
|||
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
|
||||
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
|
||||
|
||||
#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
|
||||
#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
|
||||
msgid "Unable to write new index file"
|
||||
msgstr "Kunde inte skriva ny indexfil"
|
||||
|
||||
|
|
@ -1319,7 +1319,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"
|
|||
msgid "apply changes matching the given path"
|
||||
msgstr "tillämpa ändringar som motsvarar given sökväg"
|
||||
|
||||
#: apply.c:4973 builtin/am.c:2206
|
||||
#: apply.c:4973 builtin/am.c:2260
|
||||
msgid "num"
|
||||
msgstr "antal"
|
||||
|
||||
|
|
@ -1383,7 +1383,7 @@ msgstr "sökvägar avdelas med NUL-tecken"
|
|||
msgid "ensure at least <n> lines of context match"
|
||||
msgstr "se till att åtminstone <n> rader sammanhang är lika"
|
||||
|
||||
#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
|
||||
#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
|
||||
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
|
||||
#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
|
||||
msgid "action"
|
||||
|
|
@ -1427,7 +1427,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
|
|||
msgid "do not trust the line counts in the hunk headers"
|
||||
msgstr "lite inte på antalet linjer i styckehuvuden"
|
||||
|
||||
#: apply.c:5032 builtin/am.c:2194
|
||||
#: apply.c:5032 builtin/am.c:2248
|
||||
msgid "root"
|
||||
msgstr "rot"
|
||||
|
||||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
||||
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
|
||||
|
||||
#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
|
||||
#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
|
||||
#, c-format
|
||||
msgid "pathspec '%s' did not match any files"
|
||||
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
|
||||
|
|
@ -1911,7 +1911,7 @@ msgstr ""
|
|||
"som redan finns på fjärren kan du behöva köra \"git fetch\"\n"
|
||||
"för att hämta den.\n"
|
||||
"\n"
|
||||
"Om du har tänkt sända in en ny lokal gren som skall\n"
|
||||
"Om du har tänkt sända in en ny lokal gren som ska\n"
|
||||
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
|
||||
"för att ställa in uppströmskonfigurationen när du sänder in."
|
||||
|
||||
|
|
@ -2026,8 +2026,8 @@ msgstr "index-pack dog"
|
|||
msgid "invalid color value: %.*s"
|
||||
msgstr "felaktigt färgvärde: %.*s"
|
||||
|
||||
#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
|
||||
#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
|
||||
#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
|
||||
#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
|
||||
#, c-format
|
||||
msgid "could not parse %s"
|
||||
msgstr "kunde inte tolka %s"
|
||||
|
|
@ -2150,7 +2150,7 @@ msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
|
|||
msgid "could not find commit %s"
|
||||
msgstr "kunde inte hitta incheckningen %s"
|
||||
|
||||
#: commit-graph.c:852 builtin/am.c:1287
|
||||
#: commit-graph.c:852 builtin/am.c:1292
|
||||
#, c-format
|
||||
msgid "unable to parse commit %s"
|
||||
msgstr "kunde inte tolka incheckningen %s"
|
||||
|
|
@ -3156,7 +3156,7 @@ msgid "invalid --stat value: %s"
|
|||
msgstr "ogiltigt värde för --stat: %s"
|
||||
|
||||
#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
|
||||
#: parse-options.c:199 parse-options.c:203
|
||||
#: parse-options.c:197 parse-options.c:201
|
||||
#, c-format
|
||||
msgid "%s expects a numerical value"
|
||||
msgstr "%s förväntar ett numeriskt värde"
|
||||
|
|
@ -3735,7 +3735,7 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
|
|||
#: editor.c:73
|
||||
#, c-format
|
||||
msgid "hint: Waiting for your editor to close the file...%c"
|
||||
msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"
|
||||
msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
|
||||
|
||||
#: entry.c:178
|
||||
msgid "Filtering content"
|
||||
|
|
@ -4325,9 +4325,9 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"
|
|||
msgid "failed to read the cache"
|
||||
msgstr "misslyckades läsa cachen"
|
||||
|
||||
#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
|
||||
#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
|
||||
#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
|
||||
#: builtin/stash.c:264
|
||||
#: builtin/stash.c:265
|
||||
msgid "unable to write new index file"
|
||||
msgstr "kunde inte skriva ny indexfil"
|
||||
|
||||
|
|
@ -4390,7 +4390,7 @@ msgstr "misslyckades skapa symboliska länken \"%s\": %s"
|
|||
#: merge-recursive.c:995
|
||||
#, c-format
|
||||
msgid "do not know what to do with %06o %s '%s'"
|
||||
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
|
||||
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
|
||||
|
||||
#: merge-recursive.c:1191
|
||||
#, c-format
|
||||
|
|
@ -4521,32 +4521,32 @@ msgstr "namnbyte"
|
|||
msgid "renamed"
|
||||
msgstr "namnbytt"
|
||||
|
||||
#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
|
||||
#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
|
||||
#, c-format
|
||||
msgid "Refusing to lose dirty file at %s"
|
||||
msgstr "Vägrar förlora lortig fil vid \"%s\""
|
||||
|
||||
#: merge-recursive.c:1616
|
||||
#: merge-recursive.c:1587
|
||||
#, c-format
|
||||
msgid "Refusing to lose untracked file at %s, even though it's in the way."
|
||||
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
|
||||
|
||||
#: merge-recursive.c:1674
|
||||
#: merge-recursive.c:1645
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
|
||||
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
|
||||
|
||||
#: merge-recursive.c:1705
|
||||
#: merge-recursive.c:1676
|
||||
#, c-format
|
||||
msgid "%s is a directory in %s adding as %s instead"
|
||||
msgstr "%s är en katalog i %s lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:1710
|
||||
#: merge-recursive.c:1681
|
||||
#, c-format
|
||||
msgid "Refusing to lose untracked file at %s; adding as %s instead"
|
||||
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:1737
|
||||
#: merge-recursive.c:1708
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
||||
|
|
@ -4555,28 +4555,28 @@ msgstr ""
|
|||
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
|
||||
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
|
||||
|
||||
#: merge-recursive.c:1742
|
||||
#: merge-recursive.c:1713
|
||||
msgid " (left unresolved)"
|
||||
msgstr " (lämnad olöst)"
|
||||
|
||||
#: merge-recursive.c:1851
|
||||
#: merge-recursive.c:1793
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
||||
msgstr ""
|
||||
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
|
||||
|
||||
#: merge-recursive.c:2114
|
||||
#: merge-recursive.c:2056
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (directory rename split): Unclear where to place %s because "
|
||||
"directory %s was renamed to multiple other directories, with no destination "
|
||||
"getting a majority of the files."
|
||||
msgstr ""
|
||||
"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då "
|
||||
"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
|
||||
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
|
||||
"destination fick en majoritet av filerna."
|
||||
|
||||
#: merge-recursive.c:2146
|
||||
#: merge-recursive.c:2088
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
|
||||
|
|
@ -4585,7 +4585,7 @@ msgstr ""
|
|||
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
|
||||
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
|
||||
|
||||
#: merge-recursive.c:2156
|
||||
#: merge-recursive.c:2098
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
|
||||
|
|
@ -4594,7 +4594,7 @@ msgstr ""
|
|||
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
|
||||
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
|
||||
|
||||
#: merge-recursive.c:2248
|
||||
#: merge-recursive.c:2190
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
|
||||
|
|
@ -4603,7 +4603,7 @@ msgstr ""
|
|||
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
|
||||
"%s->%s i %s"
|
||||
|
||||
#: merge-recursive.c:2493
|
||||
#: merge-recursive.c:2435
|
||||
#, c-format
|
||||
msgid ""
|
||||
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
|
||||
|
|
@ -4612,52 +4612,52 @@ msgstr ""
|
|||
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
|
||||
"bytt namn."
|
||||
|
||||
#: merge-recursive.c:3019
|
||||
#: merge-recursive.c:2961
|
||||
#, c-format
|
||||
msgid "cannot read object %s"
|
||||
msgstr "kan inte läsa objektet %s"
|
||||
|
||||
#: merge-recursive.c:3022
|
||||
#: merge-recursive.c:2964
|
||||
#, c-format
|
||||
msgid "object %s is not a blob"
|
||||
msgstr "objektet %s är inte en blob"
|
||||
|
||||
#: merge-recursive.c:3086
|
||||
#: merge-recursive.c:3028
|
||||
msgid "modify"
|
||||
msgstr "ändra"
|
||||
|
||||
#: merge-recursive.c:3086
|
||||
#: merge-recursive.c:3028
|
||||
msgid "modified"
|
||||
msgstr "ändrad"
|
||||
|
||||
#: merge-recursive.c:3098
|
||||
#: merge-recursive.c:3040
|
||||
msgid "content"
|
||||
msgstr "innehåll"
|
||||
|
||||
#: merge-recursive.c:3102
|
||||
#: merge-recursive.c:3044
|
||||
msgid "add/add"
|
||||
msgstr "tillägg/tillägg"
|
||||
|
||||
#: merge-recursive.c:3125
|
||||
#: merge-recursive.c:3067
|
||||
#, c-format
|
||||
msgid "Skipped %s (merged same as existing)"
|
||||
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
|
||||
|
||||
#: merge-recursive.c:3147 git-submodule.sh:1003
|
||||
#: merge-recursive.c:3089 git-submodule.sh:1003
|
||||
msgid "submodule"
|
||||
msgstr "undermodul"
|
||||
|
||||
#: merge-recursive.c:3148
|
||||
#: merge-recursive.c:3090
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): Merge conflict in %s"
|
||||
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
|
||||
|
||||
#: merge-recursive.c:3178
|
||||
#: merge-recursive.c:3120
|
||||
#, c-format
|
||||
msgid "Adding as %s instead"
|
||||
msgstr "Lägger till som %s istället"
|
||||
|
||||
#: merge-recursive.c:3261
|
||||
#: merge-recursive.c:3203
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Path updated: %s added in %s inside a directory that was renamed in %s; "
|
||||
|
|
@ -4666,7 +4666,7 @@ msgstr ""
|
|||
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
|
||||
"flyttar den till %s."
|
||||
|
||||
#: merge-recursive.c:3264
|
||||
#: merge-recursive.c:3206
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
|
||||
|
|
@ -4675,7 +4675,7 @@ msgstr ""
|
|||
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
|
||||
"%s, föreslår att den bör flyttas till%s."
|
||||
|
||||
#: merge-recursive.c:3268
|
||||
#: merge-recursive.c:3210
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
|
||||
|
|
@ -4684,7 +4684,7 @@ msgstr ""
|
|||
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
|
||||
"namn i %s; flyttar den till %s."
|
||||
|
||||
#: merge-recursive.c:3271
|
||||
#: merge-recursive.c:3213
|
||||
#, c-format
|
||||
msgid ""
|
||||
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
|
||||
|
|
@ -4693,60 +4693,60 @@ msgstr ""
|
|||
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
|
||||
"bytte namn i %s; flyttar den till %s."
|
||||
|
||||
#: merge-recursive.c:3385
|
||||
#: merge-recursive.c:3327
|
||||
#, c-format
|
||||
msgid "Removing %s"
|
||||
msgstr "Tar bort %s"
|
||||
|
||||
#: merge-recursive.c:3408
|
||||
#: merge-recursive.c:3350
|
||||
msgid "file/directory"
|
||||
msgstr "fil/katalog"
|
||||
|
||||
#: merge-recursive.c:3413
|
||||
#: merge-recursive.c:3355
|
||||
msgid "directory/file"
|
||||
msgstr "katalog/fil"
|
||||
|
||||
#: merge-recursive.c:3420
|
||||
#: merge-recursive.c:3362
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
||||
msgstr ""
|
||||
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
|
||||
|
||||
#: merge-recursive.c:3429
|
||||
#: merge-recursive.c:3371
|
||||
#, c-format
|
||||
msgid "Adding %s"
|
||||
msgstr "Lägger till %s"
|
||||
|
||||
#: merge-recursive.c:3438
|
||||
#: merge-recursive.c:3380
|
||||
#, c-format
|
||||
msgid "CONFLICT (add/add): Merge conflict in %s"
|
||||
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
|
||||
|
||||
#: merge-recursive.c:3482
|
||||
#: merge-recursive.c:3424
|
||||
msgid "Already up to date!"
|
||||
msgstr "Redan à jour!"
|
||||
|
||||
#: merge-recursive.c:3491
|
||||
#: merge-recursive.c:3433
|
||||
#, c-format
|
||||
msgid "merging of trees %s and %s failed"
|
||||
msgstr "sammanslagning av träden %s och %s misslyckades"
|
||||
|
||||
#: merge-recursive.c:3595
|
||||
#: merge-recursive.c:3537
|
||||
msgid "Merging:"
|
||||
msgstr "Slår ihop:"
|
||||
|
||||
#: merge-recursive.c:3608
|
||||
#: merge-recursive.c:3550
|
||||
#, c-format
|
||||
msgid "found %u common ancestor:"
|
||||
msgid_plural "found %u common ancestors:"
|
||||
msgstr[0] "hittade %u gemensam förfader:"
|
||||
msgstr[1] "hittade %u gemensamma förfäder:"
|
||||
|
||||
#: merge-recursive.c:3658
|
||||
#: merge-recursive.c:3600
|
||||
msgid "merge returned no commit"
|
||||
msgstr "sammanslagningen returnerade ingen incheckning"
|
||||
|
||||
#: merge-recursive.c:3717
|
||||
#: merge-recursive.c:3659
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your local changes to the following files would be overwritten by merge:\n"
|
||||
|
|
@ -4756,12 +4756,12 @@ msgstr ""
|
|||
"sammanslagning:\n"
|
||||
" %s"
|
||||
|
||||
#: merge-recursive.c:3814
|
||||
#: merge-recursive.c:3756
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'"
|
||||
msgstr "Kunde inte tolka objektet \"%s\""
|
||||
|
||||
#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
|
||||
#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
|
||||
msgid "Unable to write index."
|
||||
msgstr "Kunde inte skriva indexet."
|
||||
|
||||
|
|
@ -5033,7 +5033,7 @@ msgstr "%s är inkompatibel med %s"
|
|||
msgid "%s : incompatible with something else"
|
||||
msgstr "%s: inkompatibelt med något annat"
|
||||
|
||||
#: parse-options.c:92 parse-options.c:96 parse-options.c:319
|
||||
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
|
||||
#, c-format
|
||||
msgid "%s takes no value"
|
||||
msgstr "%s tar inget värde"
|
||||
|
|
@ -5043,41 +5043,41 @@ msgstr "%s tar inget värde"
|
|||
msgid "%s isn't available"
|
||||
msgstr "%s är inte tillgängligt"
|
||||
|
||||
#: parse-options.c:219
|
||||
#: parse-options.c:217
|
||||
#, c-format
|
||||
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
|
||||
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
|
||||
|
||||
#: parse-options.c:388
|
||||
#: parse-options.c:386
|
||||
#, c-format
|
||||
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
|
||||
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
|
||||
|
||||
#: parse-options.c:422 parse-options.c:430
|
||||
#: parse-options.c:420 parse-options.c:428
|
||||
#, c-format
|
||||
msgid "did you mean `--%s` (with two dashes)?"
|
||||
msgstr "menade du \"--%s\" (med två bindestreck)?"
|
||||
|
||||
#: parse-options.c:859
|
||||
#: parse-options.c:857
|
||||
#, c-format
|
||||
msgid "unknown option `%s'"
|
||||
msgstr "okänd flagga \"%s\""
|
||||
|
||||
#: parse-options.c:861
|
||||
#: parse-options.c:859
|
||||
#, c-format
|
||||
msgid "unknown switch `%c'"
|
||||
msgstr "okänd flagga \"%c\""
|
||||
|
||||
#: parse-options.c:863
|
||||
#: parse-options.c:861
|
||||
#, c-format
|
||||
msgid "unknown non-ascii option in string: `%s'"
|
||||
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
|
||||
|
||||
#: parse-options.c:887
|
||||
#: parse-options.c:885
|
||||
msgid "..."
|
||||
msgstr "..."
|
||||
|
||||
#: parse-options.c:906
|
||||
#: parse-options.c:904
|
||||
#, c-format
|
||||
msgid "usage: %s"
|
||||
msgstr "användning: %s"
|
||||
|
|
@ -5085,21 +5085,21 @@ msgstr "användning: %s"
|
|||
#. TRANSLATORS: the colon here should align with the
|
||||
#. one in "usage: %s" translation.
|
||||
#.
|
||||
#: parse-options.c:912
|
||||
#: parse-options.c:910
|
||||
#, c-format
|
||||
msgid " or: %s"
|
||||
msgstr " eller: %s"
|
||||
|
||||
#: parse-options.c:915
|
||||
#: parse-options.c:913
|
||||
#, c-format
|
||||
msgid " %s"
|
||||
msgstr " %s"
|
||||
|
||||
#: parse-options.c:954
|
||||
#: parse-options.c:952
|
||||
msgid "-NUM"
|
||||
msgstr "-TAL"
|
||||
|
||||
#: parse-options.c:968
|
||||
#: parse-options.c:966
|
||||
#, c-format
|
||||
msgid "alias of --%s"
|
||||
msgstr "alias för --%s"
|
||||
|
|
@ -5423,7 +5423,7 @@ msgstr "osorterade köposter för \"%s\""
|
|||
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
|
||||
#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
|
||||
#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
|
||||
#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
|
||||
#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
|
||||
#: builtin/submodule--helper.c:332
|
||||
msgid "index file corrupt"
|
||||
msgstr "indexfilen trasig"
|
||||
|
|
@ -5707,7 +5707,7 @@ msgstr "oväntat objekt-id vid skrivning \"%s\""
|
|||
msgid "could not write to '%s'"
|
||||
msgstr "kunde inte skriva till \"%s\""
|
||||
|
||||
#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
|
||||
#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
|
||||
#: builtin/rebase.c:1029
|
||||
#, c-format
|
||||
msgid "could not open '%s' for writing"
|
||||
|
|
@ -6488,7 +6488,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
|
|||
msgid "could not delete '%s'"
|
||||
msgstr "kunde inte ta bort \"%s\""
|
||||
|
||||
#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
|
||||
#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
|
||||
#, c-format
|
||||
msgid "could not remove '%s'"
|
||||
msgstr "kunde inte ta bort \"%s\""
|
||||
|
|
@ -6545,7 +6545,7 @@ msgid "failed to finalize '%s'"
|
|||
msgstr "misslyckades färdigställa \"%s\""
|
||||
|
||||
#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
|
||||
#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
|
||||
#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
|
||||
#: builtin/rebase.c:593
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
|
|
@ -6596,8 +6596,8 @@ msgstr "ingen nyckel i \"%.*s\""
|
|||
msgid "unable to dequote value of '%s'"
|
||||
msgstr "kan inte ta bort citering av värdet \"%s\""
|
||||
|
||||
#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
|
||||
#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
|
||||
#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
|
||||
#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
|
||||
#, c-format
|
||||
msgid "could not open '%s' for reading"
|
||||
msgstr "kunde inte öppna \"%s\" för läsning"
|
||||
|
|
@ -6648,11 +6648,11 @@ msgid ""
|
|||
" git rebase --continue\n"
|
||||
msgstr ""
|
||||
"du har köade ändringar i din arbetskatalog.\n"
|
||||
"Om ändringarna skall läggas in i föregående incheckning, kör:\n"
|
||||
"Om ändringarna ska läggas in i föregående incheckning, kör:\n"
|
||||
"\n"
|
||||
" git commit --amend %s\n"
|
||||
"\n"
|
||||
"Om de skall checkas in i en egen incheckning, kör:\n"
|
||||
"Om de ska checkas in i en egen incheckning, kör:\n"
|
||||
"\n"
|
||||
" git commit %s\n"
|
||||
"\n"
|
||||
|
|
@ -6753,7 +6753,7 @@ msgstr "kunde inte tolka HEAD:s incheckning"
|
|||
msgid "unable to parse commit author"
|
||||
msgstr "kunde inte tolka incheckningens författare"
|
||||
|
||||
#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
|
||||
#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
|
||||
msgid "git write-tree failed to write a tree"
|
||||
msgstr "git write-tree misslyckades skriva ett träd"
|
||||
|
||||
|
|
@ -6762,7 +6762,7 @@ msgstr "git write-tree misslyckades skriva ett träd"
|
|||
msgid "unable to read commit message from '%s'"
|
||||
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
|
||||
|
||||
#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
|
||||
#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
|
||||
#: builtin/merge.c:911
|
||||
msgid "failed to write commit object"
|
||||
msgstr "kunde inte skriva incheckningsobjekt"
|
||||
|
|
@ -8738,7 +8738,11 @@ msgstr "felaktigt portnummer"
|
|||
msgid "invalid '..' path segment"
|
||||
msgstr "felaktigt \"..\"-sökvägssegment"
|
||||
|
||||
#: worktree.c:259 builtin/am.c:2084
|
||||
#: walker.c:170
|
||||
msgid "Fetching objects"
|
||||
msgstr "Hämtar objekt"
|
||||
|
||||
#: worktree.c:259 builtin/am.c:2099
|
||||
#, c-format
|
||||
msgid "failed to read '%s'"
|
||||
msgstr "misslyckades läsa \"%s\""
|
||||
|
|
@ -8824,12 +8828,12 @@ msgstr "Ändringar ej i incheckningskön:"
|
|||
#: wt-status.c:238
|
||||
msgid " (use \"git add <file>...\" to update what will be committed)"
|
||||
msgstr ""
|
||||
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
|
||||
" (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)"
|
||||
|
||||
#: wt-status.c:240
|
||||
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
||||
msgstr ""
|
||||
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
|
||||
" (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)"
|
||||
|
||||
#: wt-status.c:241
|
||||
msgid ""
|
||||
|
|
@ -8847,7 +8851,7 @@ msgstr ""
|
|||
#, c-format
|
||||
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
||||
msgstr ""
|
||||
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
|
||||
" (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)"
|
||||
|
||||
#: wt-status.c:268
|
||||
msgid "both deleted:"
|
||||
|
|
@ -9368,7 +9372,7 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
|||
|
||||
#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
|
||||
#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
|
||||
#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165
|
||||
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
|
||||
msgid "dry run"
|
||||
msgstr "testkörning"
|
||||
|
||||
|
|
@ -9504,12 +9508,12 @@ msgid "--chmod param '%s' must be either -x or +x"
|
|||
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
|
||||
|
||||
#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
|
||||
#: builtin/reset.c:327
|
||||
#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
|
||||
msgid "--pathspec-from-file is incompatible with pathspec arguments"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
|
||||
|
||||
#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
|
||||
#: builtin/reset.c:333
|
||||
#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
|
||||
msgid "--pathspec-file-nul requires --pathspec-from-file"
|
||||
msgstr "--pathspec-file-nul kräver --pathspec-from-file"
|
||||
|
||||
|
|
@ -9528,109 +9532,109 @@ msgstr ""
|
|||
"Slå av detta meddelande genom att köra\n"
|
||||
"\"git config advice.addEmptyPathspec false\""
|
||||
|
||||
#: builtin/am.c:347
|
||||
#: builtin/am.c:352
|
||||
msgid "could not parse author script"
|
||||
msgstr "kunde inte tolka författarskript"
|
||||
|
||||
#: builtin/am.c:431
|
||||
#: builtin/am.c:436
|
||||
#, c-format
|
||||
msgid "'%s' was deleted by the applypatch-msg hook"
|
||||
msgstr "\"%s\" togs bort av kroken applypatch-msg"
|
||||
|
||||
#: builtin/am.c:473
|
||||
#: builtin/am.c:478
|
||||
#, c-format
|
||||
msgid "Malformed input line: '%s'."
|
||||
msgstr "Felaktig indatarad: \"%s\"."
|
||||
|
||||
#: builtin/am.c:511
|
||||
#: builtin/am.c:516
|
||||
#, c-format
|
||||
msgid "Failed to copy notes from '%s' to '%s'"
|
||||
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
|
||||
|
||||
#: builtin/am.c:537
|
||||
#: builtin/am.c:542
|
||||
msgid "fseek failed"
|
||||
msgstr "\"fseek\" misslyckades"
|
||||
|
||||
#: builtin/am.c:725
|
||||
#: builtin/am.c:730
|
||||
#, c-format
|
||||
msgid "could not parse patch '%s'"
|
||||
msgstr "kunde inte tolka patchen \"%s\""
|
||||
|
||||
#: builtin/am.c:790
|
||||
#: builtin/am.c:795
|
||||
msgid "Only one StGIT patch series can be applied at once"
|
||||
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
|
||||
|
||||
#: builtin/am.c:838
|
||||
#: builtin/am.c:843
|
||||
msgid "invalid timestamp"
|
||||
msgstr "ogiltig tidsstämpel"
|
||||
|
||||
#: builtin/am.c:843 builtin/am.c:855
|
||||
#: builtin/am.c:848 builtin/am.c:860
|
||||
msgid "invalid Date line"
|
||||
msgstr "ogiltig \"Date\"-rad"
|
||||
|
||||
#: builtin/am.c:850
|
||||
#: builtin/am.c:855
|
||||
msgid "invalid timezone offset"
|
||||
msgstr "ogiltig tidszons-offset"
|
||||
|
||||
#: builtin/am.c:943
|
||||
#: builtin/am.c:948
|
||||
msgid "Patch format detection failed."
|
||||
msgstr "Misslyckades detektera patchformat."
|
||||
|
||||
#: builtin/am.c:948 builtin/clone.c:409
|
||||
#: builtin/am.c:953 builtin/clone.c:409
|
||||
#, c-format
|
||||
msgid "failed to create directory '%s'"
|
||||
msgstr "misslyckades skapa katalogen \"%s\""
|
||||
|
||||
#: builtin/am.c:953
|
||||
#: builtin/am.c:958
|
||||
msgid "Failed to split patches."
|
||||
msgstr "Misslyckades dela patchar."
|
||||
|
||||
#: builtin/am.c:1084
|
||||
#: builtin/am.c:1089
|
||||
#, c-format
|
||||
msgid "When you have resolved this problem, run \"%s --continue\"."
|
||||
msgstr "När du har löst problemet, kör \"%s --continue\"."
|
||||
|
||||
#: builtin/am.c:1085
|
||||
#: builtin/am.c:1090
|
||||
#, c-format
|
||||
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
||||
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
|
||||
|
||||
#: builtin/am.c:1086
|
||||
#: builtin/am.c:1091
|
||||
#, c-format
|
||||
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
||||
msgstr ""
|
||||
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
|
||||
|
||||
#: builtin/am.c:1169
|
||||
#: builtin/am.c:1174
|
||||
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
|
||||
msgstr ""
|
||||
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
|
||||
|
||||
#: builtin/am.c:1197
|
||||
#: builtin/am.c:1202
|
||||
msgid "Patch is empty."
|
||||
msgstr "Patchen är tom."
|
||||
|
||||
#: builtin/am.c:1262
|
||||
#: builtin/am.c:1267
|
||||
#, c-format
|
||||
msgid "missing author line in commit %s"
|
||||
msgstr "saknad \"author\"-rad i incheckningen %s"
|
||||
|
||||
#: builtin/am.c:1265
|
||||
#: builtin/am.c:1270
|
||||
#, c-format
|
||||
msgid "invalid ident line: %.*s"
|
||||
msgstr "ogiltig ident-rad: %.*s"
|
||||
|
||||
#: builtin/am.c:1484
|
||||
#: builtin/am.c:1489
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
|
||||
"vägssammanslagning."
|
||||
|
||||
#: builtin/am.c:1486
|
||||
#: builtin/am.c:1491
|
||||
msgid "Using index info to reconstruct a base tree..."
|
||||
msgstr "Använder indexinfo för att återskapa ett basträd..."
|
||||
|
||||
#: builtin/am.c:1505
|
||||
#: builtin/am.c:1510
|
||||
msgid ""
|
||||
"Did you hand edit your patch?\n"
|
||||
"It does not apply to blobs recorded in its index."
|
||||
|
|
@ -9638,25 +9642,25 @@ msgstr ""
|
|||
"Har du handredigerat din patch?\n"
|
||||
"Den kan inte tillämpas på blobbar som antecknats i dess index."
|
||||
|
||||
#: builtin/am.c:1511
|
||||
#: builtin/am.c:1516
|
||||
msgid "Falling back to patching base and 3-way merge..."
|
||||
msgstr ""
|
||||
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
|
||||
|
||||
#: builtin/am.c:1537
|
||||
#: builtin/am.c:1542
|
||||
msgid "Failed to merge in the changes."
|
||||
msgstr "Misslyckades slå ihop ändringarna."
|
||||
|
||||
#: builtin/am.c:1569
|
||||
#: builtin/am.c:1574
|
||||
msgid "applying to an empty history"
|
||||
msgstr "tillämpar på en tom historik"
|
||||
|
||||
#: builtin/am.c:1616 builtin/am.c:1620
|
||||
#: builtin/am.c:1621 builtin/am.c:1625
|
||||
#, c-format
|
||||
msgid "cannot resume: %s does not exist."
|
||||
msgstr "kan inte återuppta: %s finns inte."
|
||||
|
||||
#: builtin/am.c:1638
|
||||
#: builtin/am.c:1643
|
||||
msgid "Commit Body is:"
|
||||
msgstr "Incheckningskroppen är:"
|
||||
|
||||
|
|
@ -9664,40 +9668,41 @@ msgstr "Incheckningskroppen är:"
|
|||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
#.
|
||||
#: builtin/am.c:1648
|
||||
#: builtin/am.c:1653
|
||||
#, c-format
|
||||
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
||||
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
|
||||
|
||||
#: builtin/am.c:1695 builtin/commit.c:398
|
||||
#: builtin/am.c:1700 builtin/commit.c:398
|
||||
msgid "unable to write index file"
|
||||
msgstr "kan inte skriva indexfil"
|
||||
|
||||
#: builtin/am.c:1699
|
||||
#: builtin/am.c:1704
|
||||
#, c-format
|
||||
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
||||
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
|
||||
|
||||
#: builtin/am.c:1739 builtin/am.c:1807
|
||||
#: builtin/am.c:1744 builtin/am.c:1812
|
||||
#, c-format
|
||||
msgid "Applying: %.*s"
|
||||
msgstr "Tillämpar: %.*s"
|
||||
|
||||
#: builtin/am.c:1756
|
||||
#: builtin/am.c:1761
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "Inga ändringar -- Patchen har redan tillämpats."
|
||||
|
||||
#: builtin/am.c:1762
|
||||
#: builtin/am.c:1767
|
||||
#, c-format
|
||||
msgid "Patch failed at %s %.*s"
|
||||
msgstr "Patch misslyckades på %s %.*s"
|
||||
|
||||
#: builtin/am.c:1766
|
||||
msgid "Use 'git am --show-current-patch' to see the failed patch"
|
||||
#: builtin/am.c:1771
|
||||
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
|
||||
msgstr ""
|
||||
"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
|
||||
"Använd \"git am --show-current-patch=diff\" för att se patchen som "
|
||||
"misslyckades"
|
||||
|
||||
#: builtin/am.c:1810
|
||||
#: builtin/am.c:1815
|
||||
msgid ""
|
||||
"No changes - did you forget to use 'git add'?\n"
|
||||
"If there is nothing left to stage, chances are that something else\n"
|
||||
|
|
@ -9707,7 +9712,7 @@ msgstr ""
|
|||
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
|
||||
"introducerat samma ändringar; kanske du bör hoppa över patchen."
|
||||
|
||||
#: builtin/am.c:1817
|
||||
#: builtin/am.c:1822
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index.\n"
|
||||
"You should 'git add' each file with resolved conflicts to mark them as "
|
||||
|
|
@ -9719,17 +9724,17 @@ msgstr ""
|
|||
"lösta.\n"
|
||||
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
|
||||
|
||||
#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
|
||||
#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
|
||||
#: builtin/reset.c:354
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'."
|
||||
msgstr "Kan inte tolka objektet \"%s\"."
|
||||
|
||||
#: builtin/am.c:1976
|
||||
#: builtin/am.c:1981
|
||||
msgid "failed to clean index"
|
||||
msgstr "misslyckades städa upp indexet"
|
||||
|
||||
#: builtin/am.c:2020
|
||||
#: builtin/am.c:2025
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
|
|
@ -9737,75 +9742,85 @@ msgstr ""
|
|||
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
|
||||
"Återställer inte till ORIG_HEAD"
|
||||
|
||||
#: builtin/am.c:2117
|
||||
#: builtin/am.c:2132
|
||||
#, c-format
|
||||
msgid "Invalid value for --patch-format: %s"
|
||||
msgstr "Felaktigt värde för --patch-format: %s"
|
||||
|
||||
#: builtin/am.c:2153
|
||||
#: builtin/am.c:2172
|
||||
#, c-format
|
||||
msgid "Invalid value for --show-current-patch: %s"
|
||||
msgstr "Felaktigt värde för --show-current-patch: %s"
|
||||
|
||||
#: builtin/am.c:2176
|
||||
#, c-format
|
||||
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
|
||||
msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
|
||||
|
||||
#: builtin/am.c:2207
|
||||
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
||||
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
|
||||
|
||||
#: builtin/am.c:2154
|
||||
#: builtin/am.c:2208
|
||||
msgid "git am [<options>] (--continue | --skip | --abort)"
|
||||
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
|
||||
|
||||
#: builtin/am.c:2160
|
||||
#: builtin/am.c:2214
|
||||
msgid "run interactively"
|
||||
msgstr "kör interaktivt"
|
||||
|
||||
#: builtin/am.c:2162
|
||||
#: builtin/am.c:2216
|
||||
msgid "historical option -- no-op"
|
||||
msgstr "historisk flagga -- no-op"
|
||||
|
||||
#: builtin/am.c:2164
|
||||
#: builtin/am.c:2218
|
||||
msgid "allow fall back on 3way merging if needed"
|
||||
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
|
||||
|
||||
#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
|
||||
#: builtin/repack.c:304 builtin/stash.c:811
|
||||
#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
|
||||
#: builtin/repack.c:304 builtin/stash.c:812
|
||||
msgid "be quiet"
|
||||
msgstr "var tyst"
|
||||
|
||||
#: builtin/am.c:2167
|
||||
#: builtin/am.c:2221
|
||||
msgid "add a Signed-off-by line to the commit message"
|
||||
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
|
||||
|
||||
#: builtin/am.c:2170
|
||||
#: builtin/am.c:2224
|
||||
msgid "recode into utf8 (default)"
|
||||
msgstr "koda om till utf8 (standard)"
|
||||
|
||||
#: builtin/am.c:2172
|
||||
#: builtin/am.c:2226
|
||||
msgid "pass -k flag to git-mailinfo"
|
||||
msgstr "sänd flaggan -k till git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2174
|
||||
#: builtin/am.c:2228
|
||||
msgid "pass -b flag to git-mailinfo"
|
||||
msgstr "sänd flaggan -b till git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2176
|
||||
#: builtin/am.c:2230
|
||||
msgid "pass -m flag to git-mailinfo"
|
||||
msgstr "sänd flaggan -m till git-mailinfo"
|
||||
|
||||
#: builtin/am.c:2178
|
||||
#: builtin/am.c:2232
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
|
||||
|
||||
#: builtin/am.c:2181
|
||||
#: builtin/am.c:2235
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
|
||||
|
||||
#: builtin/am.c:2184
|
||||
#: builtin/am.c:2238
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "ta bort allting före en saxlinje"
|
||||
|
||||
#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
|
||||
#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
|
||||
#: builtin/am.c:2213
|
||||
#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
|
||||
#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
|
||||
#: builtin/am.c:2267
|
||||
msgid "pass it through git-apply"
|
||||
msgstr "sänd det genom git-apply"
|
||||
|
||||
#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
|
||||
#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
|
||||
#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
|
||||
#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
|
||||
#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
|
||||
|
|
@ -9814,66 +9829,66 @@ msgstr "sänd det genom git-apply"
|
|||
msgid "n"
|
||||
msgstr "n"
|
||||
|
||||
#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
|
||||
#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
|
||||
#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
|
||||
msgid "format"
|
||||
msgstr "format"
|
||||
|
||||
#: builtin/am.c:2210
|
||||
#: builtin/am.c:2264
|
||||
msgid "format the patch(es) are in"
|
||||
msgstr "format för patch(ar)"
|
||||
|
||||
#: builtin/am.c:2216
|
||||
#: builtin/am.c:2270
|
||||
msgid "override error message when patch failure occurs"
|
||||
msgstr "överstyr felmeddelanden när patchfel uppstår"
|
||||
|
||||
#: builtin/am.c:2218
|
||||
#: builtin/am.c:2272
|
||||
msgid "continue applying patches after resolving a conflict"
|
||||
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
|
||||
|
||||
#: builtin/am.c:2221
|
||||
#: builtin/am.c:2275
|
||||
msgid "synonyms for --continue"
|
||||
msgstr "synonymer till --continue"
|
||||
|
||||
#: builtin/am.c:2224
|
||||
#: builtin/am.c:2278
|
||||
msgid "skip the current patch"
|
||||
msgstr "hoppa över den aktuella grenen"
|
||||
|
||||
#: builtin/am.c:2227
|
||||
#: builtin/am.c:2281
|
||||
msgid "restore the original branch and abort the patching operation."
|
||||
msgstr "återställ originalgrenen och avbryt patchningen."
|
||||
|
||||
#: builtin/am.c:2230
|
||||
#: builtin/am.c:2284
|
||||
msgid "abort the patching operation but keep HEAD where it is."
|
||||
msgstr "avbryt patchningen men behåll HEAD där det är."
|
||||
|
||||
#: builtin/am.c:2233
|
||||
msgid "show the patch being applied."
|
||||
msgstr "visa patchen som tillämpas."
|
||||
#: builtin/am.c:2288
|
||||
msgid "show the patch being applied"
|
||||
msgstr "visa patchen som tillämpas"
|
||||
|
||||
#: builtin/am.c:2237
|
||||
#: builtin/am.c:2293
|
||||
msgid "lie about committer date"
|
||||
msgstr "ljug om incheckningsdatum"
|
||||
|
||||
#: builtin/am.c:2239
|
||||
#: builtin/am.c:2295
|
||||
msgid "use current timestamp for author date"
|
||||
msgstr "använd nuvarande tidsstämpel för författardatum"
|
||||
|
||||
#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512
|
||||
#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
|
||||
#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
|
||||
#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
|
||||
msgid "key-id"
|
||||
msgstr "nyckel-id"
|
||||
|
||||
#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557
|
||||
#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
|
||||
msgid "GPG-sign commits"
|
||||
msgstr "GPG-signera incheckningar"
|
||||
|
||||
#: builtin/am.c:2245
|
||||
#: builtin/am.c:2301
|
||||
msgid "(internal use for git-rebase)"
|
||||
msgstr "(används internt av git-rebase)"
|
||||
|
||||
#: builtin/am.c:2263
|
||||
#: builtin/am.c:2319
|
||||
msgid ""
|
||||
"The -b/--binary option has been a no-op for long time, and\n"
|
||||
"it will be removed. Please do not use it anymore."
|
||||
|
|
@ -9881,16 +9896,16 @@ msgstr ""
|
|||
"Flaggan -b/--binary har varit utan funktion länge, och\n"
|
||||
"kommer tas bort. Vi ber dig att inte använda den längre."
|
||||
|
||||
#: builtin/am.c:2270
|
||||
#: builtin/am.c:2326
|
||||
msgid "failed to read the index"
|
||||
msgstr "misslyckades läsa indexet"
|
||||
|
||||
#: builtin/am.c:2285
|
||||
#: builtin/am.c:2341
|
||||
#, c-format
|
||||
msgid "previous rebase directory %s still exists but mbox given."
|
||||
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
|
||||
|
||||
#: builtin/am.c:2309
|
||||
#: builtin/am.c:2365
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Stray %s directory found.\n"
|
||||
|
|
@ -9899,11 +9914,11 @@ msgstr ""
|
|||
"Kvarbliven katalog %s hittades.\n"
|
||||
"Använd \"git am --abort\" för att ta bort den."
|
||||
|
||||
#: builtin/am.c:2315
|
||||
#: builtin/am.c:2371
|
||||
msgid "Resolve operation not in progress, we are not resuming."
|
||||
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
|
||||
|
||||
#: builtin/am.c:2325
|
||||
#: builtin/am.c:2381
|
||||
msgid "interactive mode requires patches on the command line"
|
||||
msgstr "interaktivt läge kräver patchar på kommandoraden"
|
||||
|
||||
|
|
@ -11318,7 +11333,7 @@ msgstr ""
|
|||
"\n"
|
||||
" git checkout --track origin/<namn>\n"
|
||||
"\n"
|
||||
"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n"
|
||||
"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
|
||||
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
|
||||
"checkout.defaultRemote=origin i din konfiguration."
|
||||
|
||||
|
|
@ -11539,7 +11554,7 @@ msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
|
|||
msgid "--pathspec-from-file is incompatible with --detach"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med --detach"
|
||||
|
||||
#: builtin/checkout.c:1681 builtin/reset.c:324
|
||||
#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
|
||||
msgid "--pathspec-from-file is incompatible with --patch"
|
||||
msgstr "--pathspec-from-file är inkompatibelt med --patch"
|
||||
|
||||
|
|
@ -12218,7 +12233,7 @@ msgid "id of a parent commit object"
|
|||
msgstr "id på ett förälderincheckningsobjekt"
|
||||
|
||||
#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
|
||||
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472
|
||||
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
|
||||
#: builtin/tag.c:412
|
||||
msgid "message"
|
||||
msgstr "meddelande"
|
||||
|
|
@ -12810,7 +12825,7 @@ msgstr "kat"
|
|||
#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
|
||||
#: builtin/commit-graph.c:211
|
||||
msgid "The object directory to store the graph"
|
||||
msgstr "Objektkatalogen där grafen skall lagras"
|
||||
msgstr "Objektkatalogen där grafen ska lagras"
|
||||
|
||||
#: builtin/commit-graph.c:71
|
||||
msgid "if the commit-graph is split, only verify the tip file"
|
||||
|
|
@ -13914,7 +13929,7 @@ msgid ""
|
|||
"remote name from which new revisions should be fetched."
|
||||
msgstr ""
|
||||
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
|
||||
"fjärrarkiv som nya incheckningar skall hämtas från."
|
||||
"fjärrarkiv som nya incheckningar ska hämtas från."
|
||||
|
||||
#: builtin/fetch.c:1730
|
||||
msgid "You need to specify a tag name."
|
||||
|
|
@ -15185,7 +15200,7 @@ msgstr "behörigheter"
|
|||
|
||||
#: builtin/init-db.c:492
|
||||
msgid "specify that the git repository is to be shared amongst several users"
|
||||
msgstr "ange att git-arkivet skall delas bland flera användare"
|
||||
msgstr "ange att git-arkivet ska delas bland flera användare"
|
||||
|
||||
#: builtin/init-db.c:529 builtin/init-db.c:534
|
||||
#, c-format
|
||||
|
|
@ -15229,7 +15244,7 @@ msgstr "ta bort tomma släprader"
|
|||
|
||||
#: builtin/interpret-trailers.c:99
|
||||
msgid "where to place the new trailer"
|
||||
msgstr "var nya släprader skall placeras"
|
||||
msgstr "var nya släprader ska placeras"
|
||||
|
||||
#: builtin/interpret-trailers.c:101
|
||||
msgid "action if trailer already exists"
|
||||
|
|
@ -15623,7 +15638,7 @@ msgstr "kan inte använda --check"
|
|||
|
||||
#: builtin/log.c:1854
|
||||
msgid "standard output, or directory, which one?"
|
||||
msgstr "standard ut, eller katalog, vilken skall det vara?"
|
||||
msgstr "standard ut, eller katalog, vilken ska det vara?"
|
||||
|
||||
#: builtin/log.c:1958
|
||||
msgid "--interdiff requires --cover-letter or single patch"
|
||||
|
|
@ -16963,7 +16978,7 @@ msgstr "anteckningar-ref"
|
|||
msgid "use notes from <notes-ref>"
|
||||
msgstr "använd anteckningar från <anteckningsref>"
|
||||
|
||||
#: builtin/notes.c:1034 builtin/stash.c:1610
|
||||
#: builtin/notes.c:1034 builtin/stash.c:1643
|
||||
#, c-format
|
||||
msgid "unknown subcommand: %s"
|
||||
msgstr "okänt underkommando: %s"
|
||||
|
|
@ -17212,7 +17227,7 @@ msgstr "skriv paket på standard ut"
|
|||
|
||||
#: builtin/pack-objects.c:3425
|
||||
msgid "include tag objects that refer to objects to be packed"
|
||||
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
|
||||
msgstr "inkludera taggobjekt som refererar objekt som ska packas"
|
||||
|
||||
#: builtin/pack-objects.c:3427
|
||||
msgid "keep unreachable objects"
|
||||
|
|
@ -17291,7 +17306,7 @@ msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
|
|||
#: builtin/pack-objects.c:3551
|
||||
msgid "--max-pack-size cannot be used to build a pack for transfer"
|
||||
msgstr ""
|
||||
"--max-pack-size kan inte användas för att bygga ett paket som skall överföras"
|
||||
"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
|
||||
|
||||
#: builtin/pack-objects.c:3553
|
||||
msgid "minimum pack size limit is 1 MiB"
|
||||
|
|
@ -17639,7 +17654,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Du sänder till fjärren \"%s\", som inte är uppströms för den\n"
|
||||
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
|
||||
"skall sändas för att uppdatera fjärrgrenen."
|
||||
"ska sändas för att uppdatera fjärrgrenen."
|
||||
|
||||
#: builtin/push.c:270
|
||||
msgid ""
|
||||
|
|
@ -18336,10 +18351,6 @@ msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
|
|||
msgstr ""
|
||||
"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
|
||||
|
||||
#: builtin/rebase.c:1546
|
||||
msgid "{drop,keep,ask}"
|
||||
msgstr "{drop,keep,ask}"
|
||||
|
||||
#: builtin/rebase.c:1547
|
||||
msgid "how to handle commits that become empty"
|
||||
msgstr "hur incheckningar som blir tomma ska hanteras"
|
||||
|
|
@ -19721,8 +19732,8 @@ msgstr "HEAD är nu på %s"
|
|||
msgid "Cannot do a %s reset in the middle of a merge."
|
||||
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
|
||||
|
||||
#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
|
||||
#: builtin/stash.c:618
|
||||
#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
|
||||
#: builtin/stash.c:619
|
||||
msgid "be quiet, only report errors"
|
||||
msgstr "var tyst, rapportera endast fel"
|
||||
|
||||
|
|
@ -19983,37 +19994,41 @@ msgid_plural "the following files have local modifications:"
|
|||
msgstr[0] "följande fil har lokala ändringar:"
|
||||
msgstr[1] "följande filer har lokala ändringar:"
|
||||
|
||||
#: builtin/rm.c:242
|
||||
#: builtin/rm.c:243
|
||||
msgid "do not list removed files"
|
||||
msgstr "lista inte borttagna filer"
|
||||
|
||||
#: builtin/rm.c:243
|
||||
#: builtin/rm.c:244
|
||||
msgid "only remove from the index"
|
||||
msgstr "ta bara bort från indexet"
|
||||
|
||||
#: builtin/rm.c:244
|
||||
#: builtin/rm.c:245
|
||||
msgid "override the up-to-date check"
|
||||
msgstr "överstyr àjour-testet"
|
||||
|
||||
#: builtin/rm.c:245
|
||||
#: builtin/rm.c:246
|
||||
msgid "allow recursive removal"
|
||||
msgstr "tillåt rekursiv borttagning"
|
||||
|
||||
#: builtin/rm.c:247
|
||||
#: builtin/rm.c:248
|
||||
msgid "exit with a zero status even if nothing matched"
|
||||
msgstr "avsluta med nollstatus även om inget träffades"
|
||||
|
||||
#: builtin/rm.c:289
|
||||
#: builtin/rm.c:282
|
||||
msgid "No pathspec was given. Which files should I remove?"
|
||||
msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"
|
||||
|
||||
#: builtin/rm.c:305
|
||||
msgid "please stage your changes to .gitmodules or stash them to proceed"
|
||||
msgstr ""
|
||||
"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
|
||||
|
||||
#: builtin/rm.c:307
|
||||
#: builtin/rm.c:323
|
||||
#, c-format
|
||||
msgid "not removing '%s' recursively without -r"
|
||||
msgstr "tar inte bort \"%s\" rekursivt utan -r"
|
||||
|
||||
#: builtin/rm.c:346
|
||||
#: builtin/rm.c:362
|
||||
#, c-format
|
||||
msgid "git rm: unable to remove %s"
|
||||
msgstr "git rm: kan inte ta bort %s"
|
||||
|
|
@ -20330,15 +20345,15 @@ msgstr "inaktivera gles utcheckning"
|
|||
msgid "error while refreshing working directory"
|
||||
msgstr "fel vid uppdatering av arbetskatalog"
|
||||
|
||||
#: builtin/stash.c:22 builtin/stash.c:37
|
||||
#: builtin/stash.c:22 builtin/stash.c:38
|
||||
msgid "git stash list [<options>]"
|
||||
msgstr "git stash list [<flaggor>]"
|
||||
|
||||
#: builtin/stash.c:23 builtin/stash.c:42
|
||||
#: builtin/stash.c:23 builtin/stash.c:43
|
||||
msgid "git stash show [<options>] [<stash>]"
|
||||
msgstr "git stash show [<flaggor>] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:24 builtin/stash.c:47
|
||||
#: builtin/stash.c:24 builtin/stash.c:48
|
||||
msgid "git stash drop [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash drop [-q|--quiet] [<stash>]"
|
||||
|
||||
|
|
@ -20346,15 +20361,47 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
|
|||
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:26 builtin/stash.c:62
|
||||
#: builtin/stash.c:26 builtin/stash.c:63
|
||||
msgid "git stash branch <branchname> [<stash>]"
|
||||
msgstr "git stash branch <grennamn> [<stash>]"
|
||||
|
||||
#: builtin/stash.c:27 builtin/stash.c:67
|
||||
#: builtin/stash.c:27 builtin/stash.c:68
|
||||
msgid "git stash clear"
|
||||
msgstr "git stash clear"
|
||||
|
||||
#: builtin/stash.c:28 builtin/stash.c:77
|
||||
#: builtin/stash.c:28
|
||||
msgid ""
|
||||
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
|
||||
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
|
||||
" [--] [<pathspec>...]]"
|
||||
msgstr ""
|
||||
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
|
||||
" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
|
||||
" [--] [<sökväg>...]]"
|
||||
|
||||
#: builtin/stash.c:32 builtin/stash.c:85
|
||||
msgid ""
|
||||
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [<message>]"
|
||||
msgstr ""
|
||||
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [<meddelande>]"
|
||||
|
||||
#: builtin/stash.c:53
|
||||
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:58
|
||||
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:73
|
||||
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
|
||||
msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
|
||||
|
||||
#: builtin/stash.c:78
|
||||
msgid ""
|
||||
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
|
||||
|
|
@ -20364,194 +20411,174 @@ msgstr ""
|
|||
" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
|
||||
" [--] [<sökväg>...]]"
|
||||
|
||||
#: builtin/stash.c:31 builtin/stash.c:84
|
||||
msgid ""
|
||||
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [<message>]"
|
||||
msgstr ""
|
||||
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
||||
" [-u|--include-untracked] [-a|--all] [<meddelande>]"
|
||||
|
||||
#: builtin/stash.c:52
|
||||
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:57
|
||||
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
|
||||
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
|
||||
|
||||
#: builtin/stash.c:72
|
||||
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
|
||||
msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
|
||||
|
||||
#: builtin/stash.c:127
|
||||
#: builtin/stash.c:128
|
||||
#, c-format
|
||||
msgid "'%s' is not a stash-like commit"
|
||||
msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"
|
||||
|
||||
#: builtin/stash.c:147
|
||||
#: builtin/stash.c:148
|
||||
#, c-format
|
||||
msgid "Too many revisions specified:%s"
|
||||
msgstr "För många revisioner angivna:%s"
|
||||
|
||||
#: builtin/stash.c:161 git-legacy-stash.sh:549
|
||||
#: builtin/stash.c:162 git-legacy-stash.sh:549
|
||||
msgid "No stash entries found."
|
||||
msgstr "Inga \"stash\"-poster hittades."
|
||||
|
||||
#: builtin/stash.c:175
|
||||
#: builtin/stash.c:176
|
||||
#, c-format
|
||||
msgid "%s is not a valid reference"
|
||||
msgstr "%s är inte en giltigt referens"
|
||||
|
||||
#: builtin/stash.c:224 git-legacy-stash.sh:75
|
||||
#: builtin/stash.c:225 git-legacy-stash.sh:75
|
||||
msgid "git stash clear with parameters is unimplemented"
|
||||
msgstr "\"git stash clear\" med parametrar har inte implementerats"
|
||||
|
||||
#: builtin/stash.c:403
|
||||
#: builtin/stash.c:404
|
||||
msgid "cannot apply a stash in the middle of a merge"
|
||||
msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
|
||||
|
||||
#: builtin/stash.c:414
|
||||
#: builtin/stash.c:415
|
||||
#, c-format
|
||||
msgid "could not generate diff %s^!."
|
||||
msgstr "kunde inte skapa diff %s^!."
|
||||
|
||||
#: builtin/stash.c:421
|
||||
#: builtin/stash.c:422
|
||||
msgid "conflicts in index.Try without --index."
|
||||
msgstr "konflikter i indexet. Testa utan --index."
|
||||
|
||||
#: builtin/stash.c:427
|
||||
#: builtin/stash.c:428
|
||||
msgid "could not save index tree"
|
||||
msgstr "kunde inte spara indexträd"
|
||||
|
||||
#: builtin/stash.c:436
|
||||
#: builtin/stash.c:437
|
||||
msgid "could not restore untracked files from stash"
|
||||
msgstr "kunde inte återställa ospårade filer från stash-post"
|
||||
|
||||
#: builtin/stash.c:450
|
||||
#: builtin/stash.c:451
|
||||
#, c-format
|
||||
msgid "Merging %s with %s"
|
||||
msgstr "Slår ihop %s med %s"
|
||||
|
||||
#: builtin/stash.c:460 git-legacy-stash.sh:681
|
||||
#: builtin/stash.c:461 git-legacy-stash.sh:681
|
||||
msgid "Index was not unstashed."
|
||||
msgstr "Indexet har inte tagits upp ur \"stash\":en"
|
||||
|
||||
#: builtin/stash.c:521 builtin/stash.c:620
|
||||
#: builtin/stash.c:522 builtin/stash.c:621
|
||||
msgid "attempt to recreate the index"
|
||||
msgstr "försök återskapa indexet"
|
||||
|
||||
#: builtin/stash.c:554
|
||||
#: builtin/stash.c:555
|
||||
#, c-format
|
||||
msgid "Dropped %s (%s)"
|
||||
msgstr "Kastade %s (%s)"
|
||||
|
||||
#: builtin/stash.c:557
|
||||
#: builtin/stash.c:558
|
||||
#, c-format
|
||||
msgid "%s: Could not drop stash entry"
|
||||
msgstr "%s: Kunde inte kasta \"stash\"-post"
|
||||
|
||||
#: builtin/stash.c:582
|
||||
#: builtin/stash.c:583
|
||||
#, c-format
|
||||
msgid "'%s' is not a stash reference"
|
||||
msgstr "\"%s\" är inte en \"stash\"-referens"
|
||||
|
||||
#: builtin/stash.c:632 git-legacy-stash.sh:695
|
||||
#: builtin/stash.c:633 git-legacy-stash.sh:695
|
||||
msgid "The stash entry is kept in case you need it again."
|
||||
msgstr "Stash-posten behålls ifall du behöver den igen."
|
||||
|
||||
#: builtin/stash.c:655 git-legacy-stash.sh:713
|
||||
#: builtin/stash.c:656 git-legacy-stash.sh:713
|
||||
msgid "No branch name specified"
|
||||
msgstr "Inget grennamn angavs"
|
||||
|
||||
#: builtin/stash.c:795 builtin/stash.c:832
|
||||
#: builtin/stash.c:796 builtin/stash.c:833
|
||||
#, c-format
|
||||
msgid "Cannot update %s with %s"
|
||||
msgstr "Kan inte uppdatera %s med %s"
|
||||
|
||||
#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509
|
||||
#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
|
||||
msgid "stash message"
|
||||
msgstr "\"stash\"-meddelande"
|
||||
|
||||
#: builtin/stash.c:823
|
||||
#: builtin/stash.c:824
|
||||
msgid "\"git stash store\" requires one <commit> argument"
|
||||
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
|
||||
|
||||
#: builtin/stash.c:1048 git-legacy-stash.sh:218
|
||||
#: builtin/stash.c:1049 git-legacy-stash.sh:218
|
||||
msgid "No changes selected"
|
||||
msgstr "Inga ändringar valda"
|
||||
|
||||
#: builtin/stash.c:1148 git-legacy-stash.sh:150
|
||||
#: builtin/stash.c:1149 git-legacy-stash.sh:150
|
||||
msgid "You do not have the initial commit yet"
|
||||
msgstr "Du har inte den första incheckningen ännu"
|
||||
|
||||
#: builtin/stash.c:1175 git-legacy-stash.sh:165
|
||||
#: builtin/stash.c:1176 git-legacy-stash.sh:165
|
||||
msgid "Cannot save the current index state"
|
||||
msgstr "Kan inte spara aktuellt tillstånd för indexet"
|
||||
|
||||
#: builtin/stash.c:1184 git-legacy-stash.sh:180
|
||||
#: builtin/stash.c:1185 git-legacy-stash.sh:180
|
||||
msgid "Cannot save the untracked files"
|
||||
msgstr "Kan inte spara ospårade filer"
|
||||
|
||||
#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201
|
||||
#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
|
||||
#: git-legacy-stash.sh:214
|
||||
msgid "Cannot save the current worktree state"
|
||||
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
|
||||
|
||||
#: builtin/stash.c:1232 git-legacy-stash.sh:234
|
||||
#: builtin/stash.c:1233 git-legacy-stash.sh:234
|
||||
msgid "Cannot record working tree state"
|
||||
msgstr "Kan inte registrera tillstånd för arbetskatalog"
|
||||
|
||||
#: builtin/stash.c:1281 git-legacy-stash.sh:338
|
||||
#: builtin/stash.c:1282 git-legacy-stash.sh:338
|
||||
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
||||
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
|
||||
|
||||
#: builtin/stash.c:1297
|
||||
#: builtin/stash.c:1298
|
||||
msgid "Did you forget to 'git add'?"
|
||||
msgstr "Glömde du använda \"git add\"?"
|
||||
|
||||
#: builtin/stash.c:1312 git-legacy-stash.sh:346
|
||||
#: builtin/stash.c:1313 git-legacy-stash.sh:346
|
||||
msgid "No local changes to save"
|
||||
msgstr "Inga lokala ändringar att spara"
|
||||
|
||||
#: builtin/stash.c:1319 git-legacy-stash.sh:351
|
||||
#: builtin/stash.c:1320 git-legacy-stash.sh:351
|
||||
msgid "Cannot initialize stash"
|
||||
msgstr "Kan inte initiera \"stash\""
|
||||
|
||||
#: builtin/stash.c:1334 git-legacy-stash.sh:355
|
||||
#: builtin/stash.c:1335 git-legacy-stash.sh:355
|
||||
msgid "Cannot save the current status"
|
||||
msgstr "Kan inte spara aktuell status"
|
||||
|
||||
#: builtin/stash.c:1339
|
||||
#: builtin/stash.c:1340
|
||||
#, c-format
|
||||
msgid "Saved working directory and index state %s"
|
||||
msgstr "Sparade arbetskatalogen och indexstatus %s"
|
||||
|
||||
#: builtin/stash.c:1429 git-legacy-stash.sh:385
|
||||
#: builtin/stash.c:1430 git-legacy-stash.sh:385
|
||||
msgid "Cannot remove worktree changes"
|
||||
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
|
||||
|
||||
#: builtin/stash.c:1464 builtin/stash.c:1500
|
||||
#: builtin/stash.c:1469 builtin/stash.c:1534
|
||||
msgid "keep index"
|
||||
msgstr "behåll indexet"
|
||||
|
||||
#: builtin/stash.c:1466 builtin/stash.c:1502
|
||||
#: builtin/stash.c:1471 builtin/stash.c:1536
|
||||
msgid "stash in patch mode"
|
||||
msgstr "\"stash\" i \"patch\"-läge"
|
||||
|
||||
#: builtin/stash.c:1467 builtin/stash.c:1503
|
||||
#: builtin/stash.c:1472 builtin/stash.c:1537
|
||||
msgid "quiet mode"
|
||||
msgstr "tyst läge"
|
||||
|
||||
#: builtin/stash.c:1469 builtin/stash.c:1505
|
||||
#: builtin/stash.c:1474 builtin/stash.c:1539
|
||||
msgid "include untracked files in stash"
|
||||
msgstr "ta med ospårade filer i \"stash\""
|
||||
|
||||
#: builtin/stash.c:1471 builtin/stash.c:1507
|
||||
#: builtin/stash.c:1476 builtin/stash.c:1541
|
||||
msgid "include ignore files"
|
||||
msgstr "ta med ignorerade filer"
|
||||
|
||||
#: builtin/stash.c:1567
|
||||
#: builtin/stash.c:1600
|
||||
#, c-format
|
||||
msgid "could not exec %s"
|
||||
msgstr "kunde inte köra %s"
|
||||
|
|
@ -20827,7 +20854,7 @@ msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
|
|||
|
||||
#: builtin/submodule--helper.c:1398
|
||||
msgid "where the new submodule will be cloned to"
|
||||
msgstr "var den nya undermodulen skall klonas till"
|
||||
msgstr "var den nya undermodulen ska klonas till"
|
||||
|
||||
#: builtin/submodule--helper.c:1401
|
||||
msgid "name of the new submodule"
|
||||
|
|
@ -20941,7 +20968,7 @@ msgstr "parallella jobb"
|
|||
|
||||
#: builtin/submodule--helper.c:1921
|
||||
msgid "whether the initial clone should follow the shallow recommendation"
|
||||
msgstr "om den första klonen skall följa rekommendation för grund kloning"
|
||||
msgstr "om den första klonen ska följa rekommendation för grund kloning"
|
||||
|
||||
#: builtin/submodule--helper.c:1922
|
||||
msgid "don't print cloning progress"
|
||||
|
|
@ -22210,41 +22237,41 @@ msgstr "kan inte packa upp anrop; zlib-slutfel %d"
|
|||
msgid "dumb http transport does not support shallow capabilities"
|
||||
msgstr "dum http-transport stöder inte grunda arkiv"
|
||||
|
||||
#: remote-curl.c:1037
|
||||
#: remote-curl.c:1038
|
||||
msgid "fetch failed."
|
||||
msgstr "mottagning misslyckades."
|
||||
|
||||
#: remote-curl.c:1085
|
||||
#: remote-curl.c:1086
|
||||
msgid "cannot fetch by sha1 over smart http"
|
||||
msgstr "kan inte hämta med sha1 över smart http"
|
||||
|
||||
#: remote-curl.c:1129 remote-curl.c:1135
|
||||
#: remote-curl.c:1130 remote-curl.c:1136
|
||||
#, c-format
|
||||
msgid "protocol error: expected sha/ref, got '%s'"
|
||||
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
|
||||
|
||||
#: remote-curl.c:1147 remote-curl.c:1262
|
||||
#: remote-curl.c:1148 remote-curl.c:1263
|
||||
#, c-format
|
||||
msgid "http transport does not support %s"
|
||||
msgstr "http-transporten stöder inte %s"
|
||||
|
||||
#: remote-curl.c:1183
|
||||
#: remote-curl.c:1184
|
||||
msgid "git-http-push failed"
|
||||
msgstr "git-http-push misslyckades"
|
||||
|
||||
#: remote-curl.c:1368
|
||||
#: remote-curl.c:1369
|
||||
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
|
||||
msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
|
||||
|
||||
#: remote-curl.c:1400
|
||||
#: remote-curl.c:1401
|
||||
msgid "remote-curl: error reading command stream from git"
|
||||
msgstr "remote-curl: fel vid läsning av kommandoström från git"
|
||||
|
||||
#: remote-curl.c:1407
|
||||
#: remote-curl.c:1408
|
||||
msgid "remote-curl: fetch attempted without a local repo"
|
||||
msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
|
||||
|
||||
#: remote-curl.c:1447
|
||||
#: remote-curl.c:1448
|
||||
#, c-format
|
||||
msgid "remote-curl: unknown command '%s' from git"
|
||||
msgstr "remote-curl: okänt kommando \"%s\" från git"
|
||||
|
|
@ -22279,7 +22306,7 @@ msgstr "använd <n> siffror för att visa SHA-1:or"
|
|||
|
||||
#: parse-options.h:336
|
||||
msgid "how to strip spaces and #comments from message"
|
||||
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
|
||||
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
|
||||
|
||||
#: parse-options.h:337
|
||||
msgid "read pathspec from file"
|
||||
|
|
@ -23612,11 +23639,11 @@ msgid ""
|
|||
msgstr ""
|
||||
"Du har köade ändringar i din arbetskatalog.\n"
|
||||
"Om det är meningen att ändringarna\n"
|
||||
"skall läggas in i föregående incheckning, kör:\n"
|
||||
"ska läggas in i föregående incheckning, kör:\n"
|
||||
"\n"
|
||||
" git commit --amend $gpg_sign_opt_quoted\n"
|
||||
"\n"
|
||||
"Om de skall checkas in i en egen incheckning, kör:\n"
|
||||
"Om de ska checkas in i en egen incheckning, kör:\n"
|
||||
"\n"
|
||||
" git commit $gpg_sign_opt_quoted\n"
|
||||
"\n"
|
||||
|
|
@ -24223,7 +24250,7 @@ msgstr ""
|
|||
|
||||
#: git-send-email.perl:918
|
||||
msgid "Which 8bit encoding should I declare [UTF-8]? "
|
||||
msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
|
||||
msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
|
||||
|
||||
#: git-send-email.perl:926
|
||||
#, perl-format
|
||||
|
|
@ -24240,7 +24267,7 @@ msgstr ""
|
|||
|
||||
#: git-send-email.perl:945
|
||||
msgid "To whom should the emails be sent (if anyone)?"
|
||||
msgstr "Till vem skall breven sändas (om någon)?"
|
||||
msgstr "Till vem ska breven sändas (om någon)?"
|
||||
|
||||
#: git-send-email.perl:963
|
||||
#, perl-format
|
||||
|
|
@ -24426,6 +24453,9 @@ msgstr ""
|
|||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
|
||||
|
||||
#~ msgid "{drop,keep,ask}"
|
||||
#~ msgstr "{drop,keep,ask}"
|
||||
|
||||
#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
|
||||
#~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue