Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: sv.po: Update Swedish translation (3195t0f0u)
author
Peter Krefting
<peter@softwolves.pp.se>
Tue, 9 May 2017 07:05:09 +0000
(08:05 +0100)
committer
Peter Krefting
<peter@softwolves.pp.se>
Tue, 9 May 2017 07:05:09 +0000
(08:05 +0100)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
po/sv.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
65e2041
)
diff --git
a/po/sv.po
b/po/sv.po
index 28c81d7377c9d32773baaa936159cc12a3ffc7fd..0c0f9f9b58cbdd3671ca40f6dcabff5e5037cb80 100644
(file)
--- a/
po/sv.po
+++ b/
po/sv.po
@@
-5,10
+5,10
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.1
2
.0\n"
+"Project-Id-Version: git 2.1
3
.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-0
4-23 09:54
+0800\n"
-"PO-Revision-Date: 2017-0
4-23 19:46
+0100\n"
+"POT-Creation-Date: 2017-0
5-05 09:35
+0800\n"
+"PO-Revision-Date: 2017-0
5-09 08:02
+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@
-601,7
+601,7
@@
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4911 apply.c:4914 builtin/am.c:227
7 builtin/am.c:2280
+#: apply.c:4911 apply.c:4914 builtin/am.c:227
6 builtin/am.c:2279
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
@@
-618,7
+618,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"
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4917 builtin/am.c:228
6
+#: apply.c:4917 builtin/am.c:228
5
msgid "num"
msgstr "antal"
msgid "num"
msgstr "antal"
@@
-670,7
+670,7
@@
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:5
08
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:5
15
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
@@
-678,7
+678,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"
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4949 builtin/am.c:226
5
+#: apply.c:4949 builtin/am.c:226
4
msgid "action"
msgstr "åtgärd"
msgid "action"
msgstr "åtgärd"
@@
-720,7
+720,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"
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4973 builtin/am.c:227
4
+#: apply.c:4973 builtin/am.c:227
3
msgid "root"
msgstr "rot"
msgid "root"
msgstr "rot"
@@
-768,9
+768,9
@@
msgstr "prefix"
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:
59
+#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:
60
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:54
2 builtin/ls-files.c:545
+#: builtin/hash-object.c:101 builtin/ls-files.c:54
9 builtin/ls-files.c:552
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
@@
-856,27
+856,27
@@
msgstr ""
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:44
3
+#: bisect.c:44
4
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen \"%s\""
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen \"%s\""
-#: bisect.c:44
8
+#: bisect.c:44
9
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:65
6
+#: bisect.c:65
7
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:7
09
+#: bisect.c:7
10
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:73
3
+#: bisect.c:73
4
#, c-format
msgid ""
"The merge base %s is bad.\n"
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@
-885,7
+885,7
@@
msgstr ""
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:73
8
+#: bisect.c:73
9
#, c-format
msgid ""
"The merge base %s is new.\n"
#, c-format
msgid ""
"The merge base %s is new.\n"
@@
-894,7
+894,7
@@
msgstr ""
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:74
3
+#: bisect.c:74
4
#, c-format
msgid ""
"The merge base %s is %s.\n"
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@
-903,7
+903,7
@@
msgstr ""
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:75
1
+#: bisect.c:75
2
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@
-914,7
+914,7
@@
msgstr ""
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:76
4
+#: bisect.c:76
5
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@
-926,36
+926,36
@@
msgstr ""
"%s.\n"
"Vi fortsätter ändå."
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:
799
+#: bisect.c:
800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:85
0
+#: bisect.c:85
1
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:86
7
builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:86
8
builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:91
8
+#: bisect.c:91
9
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:94
8
+#: bisect.c:94
9
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:96
8
+#: bisect.c:96
9
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:97
6
+#: bisect.c:97
7
#, c-format
msgid ""
"No testable commit found.\n"
#, c-format
msgid ""
"No testable commit found.\n"
@@
-964,7
+964,7
@@
msgstr ""
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsparametrar?\n"
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsparametrar?\n"
-#: bisect.c:99
5
+#: bisect.c:99
6
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@
-973,7
+973,7
@@
msgstr[1] "(ungefär %d steg)"
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:
999
+#: bisect.c:
1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@
-1128,7
+1128,7
@@
msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 sequencer.c:13
39 sequencer.c:1760
builtin/commit.c:777
+#: bundle.c:87 sequencer.c:13
41 sequencer.c:1767
builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@
-1137,7
+1137,7
@@
msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2
299
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2
321
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
#: builtin/merge.c:359 builtin/shortlog.c:176
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
#: builtin/merge.c:359 builtin/shortlog.c:176
@@
-1202,8
+1202,8
@@
msgstr "index-pack dog"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 sequencer.c:157
2 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:14
93 builtin/am.c:2127
+#: commit.c:40 sequencer.c:157
9 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:14
89 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@
-1231,156
+1231,156
@@
msgstr "minnet slut"
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:7
0
1
+#: config.c:7
1
1
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:7
0
5
+#: config.c:7
1
5
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:7
0
9
+#: config.c:7
1
9
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:7
1
3
+#: config.c:7
2
3
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:7
1
7
+#: config.c:7
2
7
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:7
2
1
+#: config.c:7
3
1
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:8
40
+#: config.c:8
59
msgid "out of range"
msgstr "utanför intervallet"
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:8
40
+#: config.c:8
59
msgid "invalid unit"
msgstr "ogiltig enhet"
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:8
46
+#: config.c:8
65
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:8
51
+#: config.c:8
70
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:8
54
+#: config.c:8
73
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:8
57
+#: config.c:8
76
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:8
60
+#: config.c:8
79
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:8
63
+#: config.c:8
82
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:8
66
+#: config.c:8
85
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:9
53
+#: config.c:9
80
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:10
48 config.c:1059
+#: config.c:10
75 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1
176
+#: config.c:1
203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:13
32
+#: config.c:13
59
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:15
22
+#: config.c:15
57
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1
572
+#: config.c:1
611
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:19
31
+#: config.c:19
70
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:19
52
+#: config.c:19
91
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
-#: config.c:
1978
+#: config.c:
2017
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:
1989
+#: config.c:
2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:
1991
+#: config.c:
2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:20
50
+#: config.c:20
89
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2
384 config.c:2609
+#: config.c:2
423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:25
02
+#: config.c:25
41
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:25
04
builtin/remote.c:774
+#: config.c:25
43
builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
@@
-1627,171
+1627,176
@@
msgstr "git fetch-pack: förväntade grund lista"
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
-#: fetch-pack.c:279
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "fjärrfel: %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:33
1
+#: fetch-pack.c:33
3
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi ack detailed\""
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi ack detailed\""
-#: fetch-pack.c:41
7
+#: fetch-pack.c:41
9
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:42
3
+#: fetch-pack.c:42
5
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:42
5
+#: fetch-pack.c:42
7
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:4
28
+#: fetch-pack.c:4
30
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:43
0
+#: fetch-pack.c:43
2
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:43
3
+#: fetch-pack.c:43
5
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:47
2
+#: fetch-pack.c:47
4
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:48
6
+#: fetch-pack.c:48
8
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:5
19
+#: fetch-pack.c:5
21
msgid "giving up"
msgstr "ger upp"
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:5
29
progress.c:235
+#: fetch-pack.c:5
31
progress.c:235
msgid "done"
msgstr "klart"
msgid "done"
msgstr "klart"
-#: fetch-pack.c:54
1
+#: fetch-pack.c:54
3
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:58
7
+#: fetch-pack.c:58
9
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:73
5
+#: fetch-pack.c:73
7
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:77
3
+#: fetch-pack.c:77
5
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:78
1
+#: fetch-pack.c:78
3
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:83
7
+#: fetch-pack.c:83
9
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:85
3
+#: fetch-pack.c:85
5
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:85
5
+#: fetch-pack.c:85
7
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:88
2
+#: fetch-pack.c:88
4
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:88
6
+#: fetch-pack.c:88
8
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:8
89
+#: fetch-pack.c:8
91
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:89
5
+#: fetch-pack.c:89
7
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:
899
+#: fetch-pack.c:
901
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:90
3
+#: fetch-pack.c:90
5
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:90
7
+#: fetch-pack.c:90
9
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:91
1
+#: fetch-pack.c:91
3
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:92
1
+#: fetch-pack.c:92
3
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:9
28
+#: fetch-pack.c:9
30
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:93
4
+#: fetch-pack.c:93
6
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:9
38
+#: fetch-pack.c:9
40
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:94
0
+#: fetch-pack.c:94
2
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:95
1
+#: fetch-pack.c:95
3
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:96
3
+#: fetch-pack.c:96
5
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:112
5
+#: fetch-pack.c:112
7
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:114
7
+#: fetch-pack.c:114
9
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:115
0
+#: fetch-pack.c:115
2
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
@@
-1981,7
+1986,7
@@
msgstr "kunde inte skapa \"%s.lock\": %s"
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:96 builtin/am.c:
2000 builtin/am.c:2035
builtin/checkout.c:393
+#: merge.c:96 builtin/am.c:
1999 builtin/am.c:2034
builtin/checkout.c:393
#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
@@
-2315,7
+2320,7
@@
msgstr "-TAL"
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:8
05
+#: path.c:8
10
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
@@
-2411,7
+2416,7
@@
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1
307
+#: read-cache.c:1
442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@
-2420,7
+2425,7
@@
msgstr ""
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1
317
+#: read-cache.c:1
452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@
-2429,42
+2434,41
@@
msgstr ""
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:2232
-#, c-format
-msgid "could not stat '%s"
-msgstr "kunde inte ta status på \"%s\""
-
-#: read-cache.c:2232
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:2
245
+#: read-cache.c:2
388
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:2
257
+#: read-cache.c:2
400
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: refs.c:6
19
builtin/merge.c:844
+#: refs.c:6
20
builtin/merge.c:844
#, 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"
-#: refs/files-backend.c:2531
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:
25
34
+#: refs/files-backend.c:
16
34
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs/files-backend.c:
25
43
+#: refs/files-backend.c:
16
43
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
@@
-2906,12
+2910,12
@@
msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:294 sequencer.c:16
75
+#: sequencer.c:294 sequencer.c:16
82
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:297 sequencer.c:15
53 sequencer.c:1680 sequencer.c:1694
+#: sequencer.c:297 sequencer.c:15
60 sequencer.c:1687 sequencer.c:1701
#, 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\""
@@
-2921,12
+2925,12
@@
msgstr "kunde inte skriva till \"%s\""
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:305 sequencer.c:15
58 sequencer.c:1682
+#: sequencer.c:305 sequencer.c:15
65 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
-#: sequencer.c:329 sequencer.c:814 sequencer.c:15
79 builtin/am.c:259
+#: sequencer.c:329 sequencer.c:814 sequencer.c:15
86 builtin/am.c:257
#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
@@
-3100,7
+3104,7
@@
msgstr "kan inte hämta incheckningsmeddelande för %s"
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1071 sequencer.c:182
0
+#: sequencer.c:1071 sequencer.c:182
7
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
@@
-3129,125
+3133,125
@@
msgstr "git %s: misslyckades läsa indexet"
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:130
2
+#: sequencer.c:130
3
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:131
0
+#: sequencer.c:131
1
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:134
2
+#: sequencer.c:134
4
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:13
49
+#: sequencer.c:13
56
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:135
1
+#: sequencer.c:135
8
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: %s"
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: %s"
-#: sequencer.c:13
56
+#: sequencer.c:13
63
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:13
67
+#: sequencer.c:13
74
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:13
69
+#: sequencer.c:13
76
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:143
2
+#: sequencer.c:143
9
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:14
35
+#: sequencer.c:14
42
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:149
2
+#: sequencer.c:149
9
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: %s"
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: %s"
-#: sequencer.c:153
0
+#: sequencer.c:153
7
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:153
1
+#: sequencer.c:153
8
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:15
34
+#: sequencer.c:15
41
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:15
48
+#: sequencer.c:15
55
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:16
04 sequencer.c:2159
+#: sequencer.c:16
11 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:16
06
+#: sequencer.c:16
13
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:16
08 sequencer.c:1642
+#: sequencer.c:16
15 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:16
28
builtin/grep.c:910
+#: sequencer.c:16
35
builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:163
0
+#: sequencer.c:163
7
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:163
1
+#: sequencer.c:163
8
msgid "unexpected end of file"
msgstr "oväntat filslut"
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:16
37
+#: sequencer.c:16
44
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:16
48
+#: sequencer.c:16
55
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:17
85 sequencer.c:2058
+#: sequencer.c:17
92 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:18
25
builtin/difftool.c:616
+#: sequencer.c:18
32
builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:184
1
+#: sequencer.c:184
8
msgid "could not read index"
msgstr "Kunde inte läsa indexet"
msgid "could not read index"
msgstr "Kunde inte läsa indexet"
-#: sequencer.c:18
46
+#: sequencer.c:18
53
#, c-format
msgid ""
"execution failed: %s\n"
#, c-format
msgid ""
"execution failed: %s\n"
@@
-3262,11
+3266,11
@@
msgstr ""
"\tgit rebase --continue\n"
"\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:185
2
+#: sequencer.c:185
9
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:18
58
+#: sequencer.c:18
65
#, c-format
msgid ""
"execution succeeded: %s\n"
#, c-format
msgid ""
"execution succeeded: %s\n"
@@
-3283,17
+3287,17
@@
msgstr ""
"\tgit rebase --continue\n"
"\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:19
13 git-rebase.sh:168
+#: sequencer.c:19
20 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Tillämpade autostash."
#, c-format
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: sequencer.c:19
25
+#: sequencer.c:19
32
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:19
27 git-rebase.sh:172
+#: sequencer.c:19
34 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@
-3304,57
+3308,57
@@
msgstr ""
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:20
09
+#: sequencer.c:20
16
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:20
36
+#: sequencer.c:20
58
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:20
66
+#: sequencer.c:20
88
msgid "could not read orig-head"
msgstr "Kunde inte läsa orig-head"
msgid "could not read orig-head"
msgstr "Kunde inte läsa orig-head"
-#: sequencer.c:20
70
+#: sequencer.c:20
92
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:20
77
+#: sequencer.c:20
99
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2
084
+#: sequencer.c:2
106
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:21
68
+#: sequencer.c:21
90
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:21
73
+#: sequencer.c:21
95
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2
182
+#: sequencer.c:2
204
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2
184
+#: sequencer.c:2
206
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2
186
+#: sequencer.c:2
208
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2
189
+#: sequencer.c:2
211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@
-3364,21
+3368,21
@@
msgstr ""
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: sequencer.c:2
199
+#: sequencer.c:2
221
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2
279
+#: sequencer.c:2
301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:2
283
+#: sequencer.c:2
305
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:23
16
+#: sequencer.c:23
38
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
@@
-3580,7
+3584,7
@@
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:167
9
+#: submodule.c:167
8
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@
-3588,18
+3592,18
@@
msgstr ""
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:169
1 submodule.c:1747
+#: submodule.c:169
0 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:169
5
builtin/submodule--helper.c:678
+#: submodule.c:169
4
builtin/submodule--helper.c:678
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:169
8
+#: submodule.c:169
7
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@
-3610,20
+3614,20
@@
msgstr ""
"\"%s\" till\n"
"\"%s\"\n"
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:178
2
+#: submodule.c:178
1
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:182
6
+#: submodule.c:182
5
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:184
6
+#: submodule.c:184
5
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
-#: submodule.c:186
5
+#: submodule.c:186
4
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
@@
-4043,8
+4047,8
@@
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:3
20 builtin/am.c:759
-#: builtin/am.c:84
7
builtin/commit.c:1700 builtin/merge.c:1015
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:3
18 builtin/am.c:757
+#: builtin/am.c:84
9
builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
@@
-4702,108
+4706,108
@@
msgstr "Kanske menade du att skriva \"git add .\"?\n"
msgid "index file corrupt"
msgstr "indexfilen trasig"
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/am.c:41
4
+#: builtin/am.c:41
2
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:4
91
+#: builtin/am.c:4
89
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:53
2
+#: builtin/am.c:53
0
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:56
9
+#: builtin/am.c:56
7
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:59
5
+#: builtin/am.c:59
3
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:77
5
+#: builtin/am.c:77
7
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:84
0
+#: builtin/am.c:84
2
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
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:88
7
+#: builtin/am.c:88
9
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:89
0 builtin/am.c:898
+#: builtin/am.c:89
2 builtin/am.c:900
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:89
5
+#: builtin/am.c:89
7
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:98
4
+#: builtin/am.c:98
6
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:9
89
builtin/clone.c:397
+#: builtin/am.c:9
91
builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:99
3
+#: builtin/am.c:99
5
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:112
5
builtin/commit.c:376
+#: builtin/am.c:112
7
builtin/commit.c:376
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:117
6
+#: builtin/am.c:117
8
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
#, 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:117
7
+#: builtin/am.c:117
9
#, 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."
#, 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:11
78
+#: builtin/am.c:11
80
#, 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\"."
#, 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:131
6
+#: builtin/am.c:131
5
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:13
90
builtin/log.c:1557
+#: builtin/am.c:13
86
builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/am.c:141
7
+#: builtin/am.c:141
3
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:16
10
+#: builtin/am.c:16
06
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."
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:16
12
+#: builtin/am.c:16
08
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:16
31
+#: builtin/am.c:16
27
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@
-4811,39
+4815,39
@@
msgstr ""
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:163
7
+#: builtin/am.c:163
3
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:16
62
+#: builtin/am.c:16
58
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:168
6
builtin/merge.c:631
+#: builtin/am.c:168
2
builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:16
93
+#: builtin/am.c:16
89
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:170
6
builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:170
2
builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:173
9 builtin/am.c:1743
+#: builtin/am.c:173
5 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:175
9
+#: builtin/am.c:175
5
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:176
4
+#: builtin/am.c:176
0
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@
-4851,35
+4855,35
@@
msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:177
4
+#: builtin/am.c:177
0
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: "
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:182
4
+#: builtin/am.c:182
0
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:186
1 builtin/am.c:1933
+#: builtin/am.c:186
0 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:187
7
+#: builtin/am.c:187
6
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:188
5
+#: builtin/am.c:188
4
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:189
1
+#: builtin/am.c:189
0
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:193
6
+#: builtin/am.c:193
5
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@
-4889,7
+4893,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."
"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:194
3
+#: builtin/am.c:194
2
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@
-4897,17
+4901,17
@@
msgstr ""
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
-#: builtin/am.c:205
1 builtin/am.c:2055 builtin/am.c:2067
builtin/reset.c:308
+#: builtin/am.c:205
0 builtin/am.c:2054 builtin/am.c:2066
builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/am.c:210
3
+#: builtin/am.c:210
2
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:213
7
+#: builtin/am.c:213
6
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@
-4915,75
+4919,75
@@
msgstr ""
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2
200
+#: builtin/am.c:2
199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:223
3
+#: builtin/am.c:223
2
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:223
4
+#: builtin/am.c:223
3
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:22
40
+#: builtin/am.c:22
39
msgid "run interactively"
msgstr "kör interaktivt"
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:224
2
+#: builtin/am.c:224
1
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:224
4
+#: builtin/am.c:224
3
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:224
5
builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:224
4
builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "var tyst"
#: builtin/repack.c:178
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:224
7
+#: builtin/am.c:224
6
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:22
50
+#: builtin/am.c:22
49
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:225
2
+#: builtin/am.c:225
1
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:225
4
+#: builtin/am.c:225
3
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:225
6
+#: builtin/am.c:225
5
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:225
8
+#: builtin/am.c:225
7
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
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:226
1
+#: builtin/am.c:226
0
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"
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:226
4
+#: builtin/am.c:226
3
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:226
6 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:227
8 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:229
3
+#: builtin/am.c:226
5 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:227
7 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:229
2
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:228
3
builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/am.c:228
2
builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
@@
-4991,57
+4995,57
@@
msgstr "sänd det genom git-apply"
msgid "n"
msgstr "n"
msgid "n"
msgstr "n"
-#: builtin/am.c:228
9
builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:44
2
builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:228
8
builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:44
3
builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
msgid "format"
msgstr "format"
-#: builtin/am.c:22
90
+#: builtin/am.c:22
89
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:229
6
+#: builtin/am.c:229
5
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:229
8
+#: builtin/am.c:229
7
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:230
1
+#: builtin/am.c:230
0
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:230
4
+#: builtin/am.c:230
3
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:230
7
+#: builtin/am.c:230
6
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:231
1
+#: builtin/am.c:231
0
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:231
3
+#: builtin/am.c:231
2
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:231
5
builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/am.c:231
4
builtin/commit.c:1600 builtin/merge.c:232
#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "nyckel-id"
#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:231
6
+#: builtin/am.c:231
5
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:231
9
+#: builtin/am.c:231
8
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:233
4
+#: builtin/am.c:233
3
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."
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."
@@
-5049,16
+5053,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."
"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:234
1
+#: builtin/am.c:234
0
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:235
6
+#: builtin/am.c:235
5
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
#, 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:23
80
+#: builtin/am.c:23
79
#, c-format
msgid ""
"Stray %s directory found.\n"
#, c-format
msgid ""
"Stray %s directory found.\n"
@@
-5067,7
+5071,7
@@
msgstr ""
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:238
6
+#: builtin/am.c:238
5
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@
-5097,11
+5101,6
@@
msgstr "git archive: förväntade ACK/NAK, fick EOF"
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "fjärrfel: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
@@
-5782,7
+5781,7
@@
msgstr "läs filnamn från standard in"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:35
2
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:35
6
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@
-5874,7
+5873,7
@@
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:174 builtin/column.c:30
#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
#: builtin/checkout-index.c:174 builtin/column.c:30
#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:47
2
+#: builtin/worktree.c:47
7
msgid "string"
msgstr "sträng"
msgid "string"
msgstr "sträng"
@@
-6090,8
+6089,8
@@
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:32
5
-#: builtin/worktree.c:3
27
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:32
9
+#: builtin/worktree.c:3
31
msgid "branch"
msgstr "gren"
msgid "branch"
msgstr "gren"
@@
-6107,7
+6106,7
@@
msgstr "skapa/nollställ och checka ut en gren"
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1164 builtin/worktree.c:3
29
+#: builtin/checkout.c:1164 builtin/worktree.c:3
33
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
@@
-6358,7
+6357,7
@@
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
msgstr "ta bort hela kataloger"
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:5
39
builtin/name-rev.c:348
+#: builtin/grep.c:1063 builtin/ls-files.c:5
46
builtin/name-rev.c:348
#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "mönster"
#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "mönster"
@@
-6614,7
+6613,7
@@
msgstr "kan inte packa om för att städa upp"
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:884 builtin/receive-pack.c:190
1
+#: builtin/clone.c:884 builtin/receive-pack.c:190
0
msgid "Too many arguments."
msgstr "För många argument."
msgid "Too many arguments."
msgstr "För många argument."
@@
-6652,7
+6651,7
@@
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
msgstr "arbetsträdet \"%s\" finns redan."
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:22
2 builtin/worktree.c:249
+#: builtin/worktree.c:22
1 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
@@
-7104,7
+7103,7
@@
msgid "version"
msgstr "version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
msgstr "version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:44
3
+#: builtin/worktree.c:44
8
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
@@
-7185,7
+7184,7
@@
msgstr "författare"
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1588 builtin/gc.c:35
3
+#: builtin/commit.c:1588 builtin/gc.c:35
7
msgid "date"
msgstr "datum"
msgid "date"
msgstr "datum"
@@
-7350,139
+7349,139
@@
msgstr ""
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:5
5
+#: builtin/config.c:5
6
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:5
6
+#: builtin/config.c:5
7
msgid "use global config file"
msgstr "använd global konfigurationsfil"
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:5
7
+#: builtin/config.c:5
8
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:5
8
+#: builtin/config.c:5
9
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:
59
+#: builtin/config.c:
60
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:6
0
+#: builtin/config.c:6
1
msgid "blob-id"
msgstr "blob-id"
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:6
0
+#: builtin/config.c:6
1
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:6
1
+#: builtin/config.c:6
2
msgid "Action"
msgstr "Åtgärd"
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:6
2
+#: builtin/config.c:6
3
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:6
3
+#: builtin/config.c:6
4
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:6
4
+#: builtin/config.c:6
5
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:6
5
+#: builtin/config.c:6
6
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:6
6
+#: builtin/config.c:6
7
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:6
7
+#: builtin/config.c:6
8
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:6
8
+#: builtin/config.c:6
9
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:
69
+#: builtin/config.c:
70
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:7
0
+#: builtin/config.c:7
1
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:7
1
+#: builtin/config.c:7
2
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:7
2
+#: builtin/config.c:7
3
msgid "list all"
msgstr "visa alla"
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:7
3
+#: builtin/config.c:7
4
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:7
4
+#: builtin/config.c:7
5
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:7
5
+#: builtin/config.c:7
6
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:7
6
+#: builtin/config.c:7
7
msgid "Type"
msgstr "Typ"
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:7
7
+#: builtin/config.c:7
8
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:7
8
+#: builtin/config.c:7
9
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:
79
+#: builtin/config.c:
80
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:8
0
+#: builtin/config.c:8
1
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:8
1
+#: builtin/config.c:8
2
msgid "Other"
msgstr "Andra"
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:8
2
+#: builtin/config.c:8
3
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:8
3
+#: builtin/config.c:8
4
msgid "show variable names only"
msgstr "visa endast variabelnamn"
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:8
4
+#: builtin/config.c:8
5
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:8
5
+#: builtin/config.c:8
6
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:32
7
+#: builtin/config.c:32
8
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:47
1
+#: builtin/config.c:47
2
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@
-7497,12
+7496,12
@@
msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:61
1
+#: builtin/config.c:61
5
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:62
3
+#: builtin/config.c:62
7
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@
-8297,12
+8296,12
@@
msgstr "git gc [<flaggor>]"
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:3
06
+#: builtin/gc.c:3
10
#, c-format
msgid "Can't stat %s"
msgstr "Kan inte ta status på %s"
#, c-format
msgid "Can't stat %s"
msgstr "Kan inte ta status på %s"
-#: builtin/gc.c:31
5
+#: builtin/gc.c:31
9
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@
-8317,43
+8316,43
@@
msgstr ""
"\n"
"%s"
"\n"
"%s"
-#: builtin/gc.c:35
4
+#: builtin/gc.c:35
8
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:3
56
+#: builtin/gc.c:3
60
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:3
57
+#: builtin/gc.c:3
61
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:3
58
+#: builtin/gc.c:3
62
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:37
5
+#: builtin/gc.c:37
9
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Kan inte tolka värdet %s för gc.logexpiry"
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Kan inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:40
3
+#: builtin/gc.c:40
7
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:40
5
+#: builtin/gc.c:40
9
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:4
06
+#: builtin/gc.c:4
10
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:4
27
+#: builtin/gc.c:4
31
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@
-8361,7
+8360,7
@@
msgstr ""
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:47
1
+#: builtin/gc.c:47
5
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@
-9559,103
+9558,103
@@
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"
"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/ls-files.c:46
1
+#: builtin/ls-files.c:46
8
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:51
0
+#: builtin/ls-files.c:51
7
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:51
2
+#: builtin/ls-files.c:51
9
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:5
14
+#: builtin/ls-files.c:5
21
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:5
16
+#: builtin/ls-files.c:5
23
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:5
18
+#: builtin/ls-files.c:5
25
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:52
0
+#: builtin/ls-files.c:52
7
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:52
2
+#: builtin/ls-files.c:52
9
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:5
25
+#: builtin/ls-files.c:5
32
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:5
27
+#: builtin/ls-files.c:5
34
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:5
29
+#: builtin/ls-files.c:5
36
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:53
1
+#: builtin/ls-files.c:53
8
msgid "show line endings of files"
msgstr "visa radslut i filer"
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:5
33
+#: builtin/ls-files.c:5
40
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:5
36
+#: builtin/ls-files.c:5
43
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:5
38
+#: builtin/ls-files.c:5
45
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:54
0
+#: builtin/ls-files.c:54
7
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:5
43
+#: builtin/ls-files.c:5
50
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:5
46
+#: builtin/ls-files.c:5
53
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:5
48
+#: builtin/ls-files.c:5
55
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:55
1
+#: builtin/ls-files.c:55
8
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:5
54
+#: builtin/ls-files.c:5
61
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:5
56
+#: builtin/ls-files.c:5
63
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:5
57
+#: builtin/ls-files.c:5
64
msgid "tree-ish"
msgstr "träd-igt"
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:5
58
+#: builtin/ls-files.c:5
65
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:56
0
+#: builtin/ls-files.c:56
7
msgid "show debugging data"
msgstr "visa felsökningsutdata"
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@
-11117,7
+11116,7
@@
msgstr "Se git-pull(1) för detaljer."
msgid "<remote>"
msgstr "<fjärr>"
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:45
5
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:45
6
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
@@
-11583,7
+11582,7
@@
msgstr "avbryt ombasering"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:79
6
+#: builtin/receive-pack.c:79
5
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@
-11613,7
+11612,7
@@
msgstr ""
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:81
6
+#: builtin/receive-pack.c:81
5
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@
-11634,11
+11633,11
@@
msgstr ""
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:188
9
+#: builtin/receive-pack.c:188
8
msgid "quiet"
msgstr "tyst"
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:190
3
+#: builtin/receive-pack.c:190
2
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@
-12269,22
+12268,22
@@
msgstr "git replace -d <objekt>..."
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
-#: builtin/replace.c:3
29 builtin/replace.c:367 builtin/replace.c:395
+#: builtin/replace.c:3
30 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Objektnamnet är inte giltigt: \"%s\""
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Objektnamnet är inte giltigt: \"%s\""
-#: builtin/replace.c:3
59
+#: builtin/replace.c:3
60
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:36
1
+#: builtin/replace.c:36
2
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:37
2
+#: builtin/replace.c:37
3
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@
-12293,45
+12292,45
@@
msgstr ""
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:40
5
+#: builtin/replace.c:40
6
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."
-#: builtin/replace.c:40
6
+#: builtin/replace.c:40
7
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:41
2
+#: builtin/replace.c:41
3
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:43
6
+#: builtin/replace.c:43
7
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:43
7
+#: builtin/replace.c:43
8
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:43
8
+#: builtin/replace.c:43
9
msgid "edit existing object"
msgstr "redigera befintligt objekt"
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:4
39
+#: builtin/replace.c:4
40
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:44
0
+#: builtin/replace.c:44
1
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:44
1
+#: builtin/replace.c:44
2
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:44
2
+#: builtin/replace.c:44
3
msgid "use this format"
msgstr "använd detta format"
msgid "use this format"
msgstr "använd detta format"
@@
-12944,7
+12943,7
@@
msgstr "alternativa ankare för relativa sökvägar"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:38
2
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:38
0
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
@@
-13258,30
+13257,6
@@
msgstr "inget taggmeddelande?"
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:312
-msgid "tag: tagging "
-msgstr "tag: taggar"
-
-#: builtin/tag.c:320
-msgid "object of unknown type"
-msgstr "objekt av okänd typ"
-
-#: builtin/tag.c:327
-msgid "commit object"
-msgstr "incheckningsobjekt"
-
-#: builtin/tag.c:335
-msgid "tree object"
-msgstr "trädobjekt"
-
-#: builtin/tag.c:338
-msgid "blob object"
-msgstr "blob-objekt"
-
-#: builtin/tag.c:341
-msgid "other tag object"
-msgstr "annat taggobjekt"
-
#: builtin/tag.c:397
msgid "list tag names"
msgstr "lista taggnamn"
#: builtin/tag.c:397
msgid "list tag names"
msgstr "lista taggnamn"
@@
-13715,27
+13690,27
@@
msgstr "git worktree prune [<flaggor>]"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:4
2
+#: builtin/worktree.c:4
3
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:4
8
+#: builtin/worktree.c:4
9
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:5
3
+#: builtin/worktree.c:5
4
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:6
4
+#: builtin/worktree.c:6
5
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:8
0
+#: builtin/worktree.c:8
1
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
@@
-13753,61
+13728,65
@@
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:23
6
+#: builtin/worktree.c:23
5
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:27
2
+#: builtin/worktree.c:27
4
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:32
4
+#: builtin/worktree.c:32
8
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:3
26
+#: builtin/worktree.c:3
30
msgid "create a new branch"
msgstr "skapa en ny gren"
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:3
28
+#: builtin/worktree.c:3
32
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:33
0
+#: builtin/worktree.c:33
4
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:338
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "låt arbetskatalogen förbli låst"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:47
3
+#: builtin/worktree.c:47
8
msgid "reason for locking"
msgstr "orsak till lås"
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:4
85 builtin/worktree.c:518
+#: builtin/worktree.c:4
90 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:4
87 builtin/worktree.c:520
+#: builtin/worktree.c:4
92 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:49
2
+#: builtin/worktree.c:49
7
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:49
4
+#: builtin/worktree.c:49
9
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:52
2
+#: builtin/worktree.c:52
7
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
@@
-13875,15
+13854,20
@@
msgstr ""
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:355
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer har negativt värde; använder förvalet %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:36
4
+#: http.c:36
6
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
-#: http.c:17
55
+#: http.c:17
66
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@
-14271,7
+14255,7
@@
msgstr "Försök enkel sammanslagning med $pretty_name"
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-rebase.sh:5
7
+#: git-rebase.sh:5
8
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@
-14282,37
+14266,37
@@
msgstr ""
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
-#: git-rebase.sh:15
7 git-rebase.sh:396
+#: git-rebase.sh:15
8 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:17
1
+#: git-rebase.sh:17
2
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:21
1
+#: git-rebase.sh:21
2
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:21
6
+#: git-rebase.sh:21
7
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:35
7
+#: git-rebase.sh:35
8
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:36
8
+#: git-rebase.sh:36
9
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:37
5
+#: git-rebase.sh:37
6
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:37
8
+#: git-rebase.sh:37
9
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@
-14320,7
+14304,7
@@
msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:41
8
+#: git-rebase.sh:41
9
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@
-14341,65
+14325,65
@@
msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:4
69
+#: git-rebase.sh:4
70
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:49
3
+#: git-rebase.sh:49
4
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:49
6 git-rebase.sh:500
+#: git-rebase.sh:49
7 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:50
5
+#: git-rebase.sh:50
6
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:52
8
+#: git-rebase.sh:52
9
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:56
1
+#: git-rebase.sh:56
2
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:56
6
+#: git-rebase.sh:56
7
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:57
0
+#: git-rebase.sh:57
1
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:59
0
+#: git-rebase.sh:59
1
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:59
4
+#: git-rebase.sh:59
5
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:60
5
+#: git-rebase.sh:60
6
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:61
4
+#: git-rebase.sh:61
5
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:62
4
+#: git-rebase.sh:62
5
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
@@
-16157,6
+16141,27
@@
msgstr ""
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "could not stat '%s"
+#~ msgstr "kunde inte ta status på \"%s\""
+
+#~ msgid "tag: tagging "
+#~ msgstr "tag: taggar"
+
+#~ msgid "object of unknown type"
+#~ msgstr "objekt av okänd typ"
+
+#~ msgid "commit object"
+#~ msgstr "incheckningsobjekt"
+
+#~ msgid "tree object"
+#~ msgstr "trädobjekt"
+
+#~ msgid "blob object"
+#~ msgstr "blob-objekt"
+
+#~ msgid "other tag object"
+#~ msgstr "annat taggobjekt"
+
#~ msgid ""
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
#~ "Perhaps you forgot to add either ':/' or '.' ?"
#~ msgid ""
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
#~ "Perhaps you forgot to add either ':/' or '.' ?"