Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: sv.po: Update Swedish translation (2477t0f0u)
author
Peter Krefting
<peter@softwolves.pp.se>
Sat, 26 Dec 2015 11:27:15 +0000
(12:27 +0100)
committer
Peter Krefting
<peter@softwolves.pp.se>
Sat, 26 Dec 2015 11:27:15 +0000
(12:27 +0100)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
po/sv.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
171e58a
)
diff --git
a/po/sv.po
b/po/sv.po
index 3774b9f33c5803d2431d5074a31cfff9ea9e7577..940c5c57aa084838ec5c43fa1ba958d27f51ca24 100644
(file)
--- a/
po/sv.po
+++ b/
po/sv.po
@@
-7,10
+7,10
@@
msgid ""
msgstr ""
"Project-Id-Version: git 2.6.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: git 2.6.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-
11 23:36
+0800\n"
-"PO-Revision-Date: 2015-12-
18 09:06
+0100\n"
+"POT-Creation-Date: 2015-12-
22 22:50
+0800\n"
+"PO-Revision-Date: 2015-12-
26 12:25
+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
-"Language-Team: S
venska
<tp-sv@listor.tp-sv.se>\n"
+"Language-Team: S
wedish
<tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@
-75,7
+75,7
@@
msgstr "fmt"
msgid "archive format"
msgstr "arkivformat"
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:430 builtin/log.c:122
8
+#: archive.c:430 builtin/log.c:122
9
msgid "prefix"
msgstr "prefix"
msgid "prefix"
msgstr "prefix"
@@
-280,7
+280,7
@@
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:14
56 builtin/log.c:1689
builtin/merge.c:358
+#: builtin/log.c:849 builtin/log.c:14
61 builtin/log.c:1694
builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@
-320,7
+320,7
@@
msgstr "rev-list dog"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
6
builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
9
builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
@@
-1260,16
+1260,16
@@
msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: revision.c:219
1
+#: revision.c:219
3
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:219
4
+#: revision.c:219
6
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:23
88
+#: revision.c:23
90
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
@@
-1683,30
+1683,21
@@
msgstr "kan inte komma åt \"%s\": %s"
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "okänd användare"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:6
47
+#: wrapper.c:6
35
#, c-format
msgid "could not open %s for writing"
msgstr "kunde inte öppna %s för skrivning"
#, c-format
msgid "could not open %s for writing"
msgstr "kunde inte öppna %s för skrivning"
-#: wrapper.c:6
58
builtin/am.c:425
+#: wrapper.c:6
46
builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:6
64
+#: wrapper.c:6
52
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
@@
-2235,14
+2226,14
@@
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:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
5
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
3
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:164
0
builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/log.c:164
5
builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
msgid "be verbose"
msgstr "var pratsam"
@@
-2428,7
+2419,7
@@
msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/am.c:1417 builtin/log.c:134
4
+#: builtin/am.c:1417 builtin/log.c:134
7
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
@@
-4234,7
+4225,7
@@
msgstr "utför en 3-vägssammanslagning för den nya grenen"
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1151 builtin/log.c:126
3
parse-options.h:250
+#: builtin/checkout.c:1151 builtin/log.c:126
6
parse-options.h:250
msgid "style"
msgstr "stil"
msgid "style"
msgstr "stil"
@@
-4256,7
+4247,7
@@
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
60
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
58
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
@@
-5145,7
+5136,7
@@
msgstr "visa koncis status"
msgid "show branch information"
msgstr "visa information om gren"
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
6
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
4
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
@@
-5272,7
+5263,7
@@
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:121
5
builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:121
6
builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
@@
-5841,7
+5832,7
@@
msgstr "fördjupa historik för grund klon"
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:118 builtin/log.c:123
2
+#: builtin/fetch.c:118 builtin/log.c:123
3
msgid "dir"
msgstr "kat"
msgid "dir"
msgstr "kat"
@@
-7160,187
+7151,191
@@
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:121
0
+#: builtin/log.c:121
1
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:121
3
+#: builtin/log.c:121
4
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:121
7
+#: builtin/log.c:121
8
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:12
19
+#: builtin/log.c:12
20
msgid "generate a cover letter"
msgstr "generera ett följebrev"
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:122
1
+#: builtin/log.c:122
2
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:122
2
+#: builtin/log.c:122
3
msgid "sfx"
msgstr "sfx"
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:122
3
+#: builtin/log.c:122
4
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:122
5
+#: builtin/log.c:122
6
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:122
7
+#: builtin/log.c:122
8
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:12
29
+#: builtin/log.c:12
30
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:123
2
+#: builtin/log.c:123
3
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:123
5
+#: builtin/log.c:123
6
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:123
8
+#: builtin/log.c:123
9
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1240
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "använd hashvärde med nollor i From-huvud"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:124
2
+#: builtin/log.c:124
5
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:124
4
+#: builtin/log.c:124
7
msgid "Messaging"
msgstr "E-post"
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:124
5
+#: builtin/log.c:124
8
msgid "header"
msgstr "huvud"
msgid "header"
msgstr "huvud"
-#: builtin/log.c:124
6
+#: builtin/log.c:124
9
msgid "add email header"
msgstr "lägg till e-posthuvud"
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:12
47 builtin/log.c:1249
+#: builtin/log.c:12
50 builtin/log.c:1252
msgid "email"
msgstr "epost"
msgid "email"
msgstr "epost"
-#: builtin/log.c:12
47
+#: builtin/log.c:12
50
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:12
49
+#: builtin/log.c:12
52
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:125
1
+#: builtin/log.c:125
4
msgid "ident"
msgstr "ident"
msgid "ident"
msgstr "ident"
-#: builtin/log.c:125
2
+#: builtin/log.c:125
5
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:125
4
+#: builtin/log.c:125
7
msgid "message-id"
msgstr "meddelande-id"
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:125
5
+#: builtin/log.c:125
8
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:125
6 builtin/log.c:1259
+#: builtin/log.c:125
9 builtin/log.c:1262
msgid "boundary"
msgstr "gräns"
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:12
57
+#: builtin/log.c:12
60
msgid "attach the patch"
msgstr "bifoga patchen"
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:126
0
+#: builtin/log.c:126
3
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:126
4
+#: builtin/log.c:126
7
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:126
6
+#: builtin/log.c:126
9
msgid "signature"
msgstr "signatur"
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:12
67
+#: builtin/log.c:12
70
msgid "add a signature"
msgstr "lägg till signatur"
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:12
69
+#: builtin/log.c:12
72
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:127
0
+#: builtin/log.c:127
3
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:13
59
+#: builtin/log.c:13
62
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:136
1
+#: builtin/log.c:136
4
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:13
69
+#: builtin/log.c:13
72
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:137
1
+#: builtin/log.c:137
4
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:137
3
+#: builtin/log.c:137
6
msgid "--check does not make sense"
msgstr "kan inte använda --check"
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1
396
+#: builtin/log.c:1
401
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1
398
+#: builtin/log.c:1
403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1
495
+#: builtin/log.c:1
500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:15
58
+#: builtin/log.c:15
63
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:16
06
+#: builtin/log.c:16
11
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:166
0
+#: builtin/log.c:166
5
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/log.c:167
1 builtin/log.c:1673 builtin/log.c:1685
+#: builtin/log.c:167
6 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
@@
-8760,19
+8755,19
@@
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/push.c:1
5
+#: builtin/push.c:1
6
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:8
6
+#: builtin/push.c:8
8
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:9
6
+#: builtin/push.c:9
8
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:14
0
+#: builtin/push.c:14
2
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@
-8781,7
+8776,7
@@
msgstr ""
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:14
3
+#: builtin/push.c:14
5
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@
-8806,7
+8801,7
@@
msgstr ""
" git push %s %s\n"
"%s"
" git push %s %s\n"
"%s"
-#: builtin/push.c:1
58
+#: builtin/push.c:1
60
#, c-format
msgid ""
"You are not currently on a branch.\n"
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@
-8821,7
+8816,7
@@
msgstr ""
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:17
2
+#: builtin/push.c:17
4
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@
-8834,12
+8829,12
@@
msgstr ""
"\n"
" git push --set-upstream %s %s\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:18
0
+#: builtin/push.c:18
2
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:18
3
+#: builtin/push.c:18
5
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@
-8850,7
+8845,7
@@
msgstr ""
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:20
6
+#: builtin/push.c:20
8
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@
-8898,14
+8893,14
@@
msgstr ""
"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
"äldre versioner av Git.)"
"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
"äldre versioner av Git.)"
-#: builtin/push.c:27
3
+#: builtin/push.c:27
5
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:28
0
+#: builtin/push.c:28
2
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@
-8917,7
+8912,7
@@
msgstr ""
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:28
6
+#: builtin/push.c:28
8
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@
-8929,7
+8924,7
@@
msgstr ""
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:29
2
+#: builtin/push.c:29
4
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@
-8943,11
+8938,11
@@
msgstr ""
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:
299
+#: builtin/push.c:
301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:30
2
+#: builtin/push.c:30
4
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@
-8958,22
+8953,22
@@
msgstr ""
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:36
1
+#: builtin/push.c:36
3
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:36
5
+#: builtin/push.c:36
7
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:39
5
+#: builtin/push.c:39
7
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:39
6
+#: builtin/push.c:39
8
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@
-8994,100
+8989,104
@@
msgstr ""
"\n"
" git push <namn>\n"
"\n"
" git push <namn>\n"
-#: builtin/push.c:41
1
+#: builtin/push.c:41
3
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:41
2
+#: builtin/push.c:41
4
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:41
7
+#: builtin/push.c:41
9
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:4
18
+#: builtin/push.c:4
20
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:42
3
+#: builtin/push.c:42
5
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:53
9
+#: builtin/push.c:53
7
msgid "repository"
msgstr "arkiv"
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:5
40
builtin/send-pack.c:161
+#: builtin/push.c:5
38
builtin/send-pack.c:161
msgid "push all refs"
msgstr "sänd alla referenser"
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:5
41
builtin/send-pack.c:163
+#: builtin/push.c:5
39
builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "spegla alla referenser"
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:54
3
+#: builtin/push.c:54
1
msgid "delete refs"
msgstr "ta bort referenser"
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:54
4
+#: builtin/push.c:54
2
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:54
7
builtin/send-pack.c:164
+#: builtin/push.c:54
5
builtin/send-pack.c:164
msgid "force updates"
msgstr "tvinga uppdateringar"
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:54
9
builtin/send-pack.c:175
+#: builtin/push.c:54
7
builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:5
50
builtin/send-pack.c:176
+#: builtin/push.c:5
48
builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:55
5
builtin/send-pack.c:169
+#: builtin/push.c:55
3
builtin/send-pack.c:169
msgid "use thin pack"
msgstr "använd tunna paket"
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:55
6 builtin/push.c:557
builtin/send-pack.c:158
+#: builtin/push.c:55
4 builtin/push.c:555
builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "program för att ta emot paket"
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:55
8
+#: builtin/push.c:55
6
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:5
61
+#: builtin/push.c:5
59
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:56
3
+#: builtin/push.c:56
1
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:56
4
+#: builtin/push.c:56
2
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:56
7
builtin/send-pack.c:166
+#: builtin/push.c:56
5
builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:56
9
builtin/send-pack.c:170
+#: builtin/push.c:56
7
builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:57
9
+#: builtin/push.c:57
7
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:5
81
+#: builtin/push.c:5
79
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
@@
-11978,6
+11977,12
@@
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
+
+#~ msgid "no such user"
+#~ msgstr "okänd användare"
+
#~ msgid "branch '%s' does not point at a commit"
#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
#~ msgid "branch '%s' does not point at a commit"
#~ msgstr "grenen \"%s\" pekar inte på en incheckning"