Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: sv.po: Update Swedish translation (2305t0f0u)
author
Peter Krefting
<peter@softwolves.pp.se>
Fri, 27 Mar 2015 08:57:48 +0000
(09:57 +0100)
committer
Peter Krefting
<peter@softwolves.pp.se>
Fri, 27 Mar 2015 08:57:48 +0000
(09:57 +0100)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
po/sv.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c12468b
)
diff --git
a/po/sv.po
b/po/sv.po
index 0440443132b7dd77160ac2e0f02c5804e222cd71..1a318a22a1f5d5a45eaab2624c81708b9d9302e7 100644
(file)
--- a/
po/sv.po
+++ b/
po/sv.po
@@
-5,10
+5,10
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.
0
.0\n"
+"Project-Id-Version: git 2.
4
.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: 2015-0
1-21 14:21
+0800\n"
-"PO-Revision-Date: 2015-0
1-21 14:57+08
00\n"
+"POT-Creation-Date: 2015-0
3-27 13:33
+0800\n"
+"PO-Revision-Date: 2015-0
3-27 09:56+01
00\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"
@@
-16,6
+16,7
@@
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
#: advice.c:55
#, c-format
#: advice.c:55
#, c-format
@@
-31,8
+32,8
@@
msgstr ""
"som lämpligt för att ange lösning och checka in."
#: archive.c:11
"som lämpligt för att ange lösning och checka in."
#: archive.c:11
-msgid "git archive [
options
] <tree-ish> [<path>...]"
-msgstr "git archive [
flaggor
] <träd-igt> [<sökväg>...]"
+msgid "git archive [
<options>
] <tree-ish> [<path>...]"
+msgstr "git archive [
<flaggor>
] <träd-igt> [<sökväg>...]"
#: archive.c:12
msgid "git archive --list"
#: archive.c:12
msgid "git archive --list"
@@
-40,9
+41,9
@@
msgstr "git archive --list"
#: archive.c:13
msgid ""
#: archive.c:13
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [
options
] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [
<options>
] <tree-ish> [<path>...]"
msgstr ""
msgstr ""
-"git archive --remote <arkiv> [--exec <kmd>] [
flaggor
] <träd-igt> "
+"git archive --remote <arkiv> [--exec <kmd>] [
<flaggor>
] <träd-igt> "
"[<sökväg>...]"
#: archive.c:14
"[<sökväg>...]"
#: archive.c:14
@@
-70,10
+71,10
@@
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:430 builtin/archive.c:88 builtin/blame.c:251
7
-#: builtin/blame.c:251
8
builtin/config.c:57 builtin/fast-export.c:986
+#: archive.c:430 builtin/archive.c:88 builtin/blame.c:251
6
+#: builtin/blame.c:251
7
builtin/config.c:57 builtin/fast-export.c:986
#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
-#: builtin/ls-files.c:4
89 builtin/ls-files.c:492
builtin/notes.c:394
+#: builtin/ls-files.c:4
46 builtin/ls-files.c:449
builtin/notes.c:394
#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
msgid "file"
msgstr "fil"
#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
msgid "file"
msgstr "fil"
@@
-122,7
+123,7
@@
msgstr "kommando"
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: attr.c:2
58
+#: attr.c:2
64
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@
-251,7
+252,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 builtin/commit.c:7
70
+#: bundle.c:87 builtin/commit.c:7
64
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@
-260,8
+261,8
@@
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 sequencer.c:6
45 sequencer.c:1100 builtin/blame.c:2706
-#: builtin/branch.c:65
2 builtin/commit.c:1049
builtin/log.c:330
+#: bundle.c:163 sequencer.c:6
50 sequencer.c:1105 builtin/blame.c:2705
+#: builtin/branch.c:65
9 builtin/commit.c:1043
builtin/log.c:330
#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
@@
-302,21
+303,21
@@
msgstr "rev-list dog"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:43
8
builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#: bundle.c:43
7
builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:44
4
+#: bundle.c:44
3
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:45
4
+#: bundle.c:45
3
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:47
5
+#: bundle.c:47
4
msgid "index-pack died"
msgstr "index-pack dog"
msgid "index-pack died"
msgstr "index-pack dog"
@@
-339,55
+340,55
@@
msgstr "%s %s är inte en incheckning!"
msgid "memory exhausted"
msgstr "minnet slut"
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:4
69 config.c:471
+#: config.c:4
74 config.c:476
#, c-format
msgid "bad config file line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
#, c-format
msgid "bad config file line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:5
87
+#: config.c:5
92
#, 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:5
89
+#: config.c:5
94
#, 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:67
4
+#: config.c:67
9
#, 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:75
2 config.c:763
+#: config.c:75
7 config.c:768
#, 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:8
85
+#: config.c:8
90
#, 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:121
1
+#: config.c:121
6
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:127
2
+#: config.c:127
7
msgid "unknown error occured while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
msgid "unknown error occured while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:1
596
+#: config.c:1
601
#, 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:1
598
+#: config.c:1
603
#, 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:16
57
+#: config.c:16
62
#, 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"
@@
-479,7
+480,7
@@
msgstr[1] "%lu år sedan"
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:5
1
6
+#: diffcore-rename.c:5
3
6
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
@@
-507,16
+508,16
@@
msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:295
7
+#: diff.c:295
6
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:335
2
+#: diff.c:335
1
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:351
5
+#: diff.c:351
4
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@
-525,7
+526,7
@@
msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:352
9
+#: diff.c:352
8
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
@@
-1024,7
+1025,7
@@
msgstr "kunde inte tolka format för --pretty"
msgid "done"
msgstr "klart"
msgid "done"
msgstr "klart"
-#: read-cache.c:12
67
+#: read-cache.c:12
73
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@
-1033,7
+1034,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:12
77
+#: read-cache.c:12
83
#, 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"
@@
-1119,23
+1120,31
@@
msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: run-command.c:87
+#: revision.c:2348
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent är inkompatibelt med --bisect"
+
+#: run-command.c:83
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:8
9
+#: run-command.c:8
5
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
-#: send-pack.c:2
68
+#: send-pack.c:2
72
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:3
25
+#: send-pack.c:3
56
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
+#: send-pack.c:366
+msgid "server does not support --atomic push"
+msgstr "servern stöder inte push med --atomic"
+
#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
#: builtin/merge.c:1005
#, c-format
#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
#: builtin/merge.c:1005
#, c-format
@@
-1166,7
+1175,7
@@
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:211 sequencer.c:8
56 sequencer.c:939
+#: sequencer.c:211 sequencer.c:8
61 sequencer.c:944
#, 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"
@@
-1202,184
+1211,184
@@
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
-#: sequencer.c:4
06
+#: sequencer.c:4
11
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
-#: sequencer.c:41
1
+#: sequencer.c:41
6
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:4
77
+#: sequencer.c:4
82
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
-#: sequencer.c:
496
+#: sequencer.c:
501
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:50
4
+#: sequencer.c:50
9
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
-#: sequencer.c:5
08
+#: sequencer.c:5
13
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:52
1
+#: sequencer.c:52
6
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:5
25
+#: sequencer.c:5
30
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
-#: sequencer.c:61
1
+#: sequencer.c:61
6
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:61
2
+#: sequencer.c:61
7
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:6
48
+#: sequencer.c:6
53
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:6
56
+#: sequencer.c:6
61
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:66
0
+#: sequencer.c:66
5
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:72
0
+#: sequencer.c:72
5
#, c-format
msgid "Cannot %s during a %s"
msgstr "kan inte %s under en %s"
#, c-format
msgid "Cannot %s during a %s"
msgstr "kan inte %s under en %s"
-#: sequencer.c:74
2
+#: sequencer.c:74
7
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
-#: sequencer.c:7
47
+#: sequencer.c:7
52
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
-#: sequencer.c:76
0
+#: sequencer.c:76
5
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
-#: sequencer.c:76
4
+#: sequencer.c:76
9
#, 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:77
1
+#: sequencer.c:77
6
#, 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:80
1
+#: sequencer.c:80
6
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
-#: sequencer.c:80
4
+#: sequencer.c:80
9
#, 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:8
16
+#: sequencer.c:8
21
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
-#: sequencer.c:8
37
+#: sequencer.c:8
42
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:8
38
+#: sequencer.c:8
43
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:84
2
+#: sequencer.c:84
7
#, 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:8
58 sequencer.c:943
+#: sequencer.c:8
63 sequencer.c:948
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
-#: sequencer.c:8
77 sequencer.c:1013
+#: sequencer.c:8
82 sequencer.c:1018
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:8
79
+#: sequencer.c:8
84
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:88
1
+#: sequencer.c:88
6
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:90
3 builtin/apply.c:4128
+#: sequencer.c:90
8 builtin/apply.c:4286
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
-#: sequencer.c:9
06
+#: sequencer.c:9
11
#, 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:9
07
+#: sequencer.c:9
12
msgid "unexpected end of file"
msgstr "oväntat filslut"
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:91
3
+#: sequencer.c:91
8
#, 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:9
36
+#: sequencer.c:9
41
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:108
1
+#: sequencer.c:108
6
#, 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:108
4
+#: sequencer.c:108
9
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:11
18
+#: sequencer.c:11
23
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"
-#: sequencer.c:11
19
+#: sequencer.c:11
24
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
@@
-1449,38
+1458,38
@@
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:11
11
builtin/init-db.c:371
+#: submodule.c:11
09
builtin/init-db.c:371
#, c-format
msgid "Could not create git link %s"
msgstr "Kunde inte skapa gitlänk %s"
#, c-format
msgid "Could not create git link %s"
msgstr "Kunde inte skapa gitlänk %s"
-#: submodule.c:112
2
+#: submodule.c:112
0
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Kunde inte sätta core.worktree i %s"
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Kunde inte sätta core.worktree i %s"
-#: trailer.c:
500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
-#: trailer.c:5
70
+#: trailer.c:
491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:5
61
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:5
52 trailer.c:557
builtin/remote.c:290
+#: trailer.c:5
43 trailer.c:548
builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
-#: trailer.c:5
90
+#: trailer.c:5
81
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%.*s\""
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%.*s\""
-#: trailer.c:7
10
+#: trailer.c:7
01
#, c-format
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
#, c-format
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:7
13
+#: trailer.c:7
04
msgid "could not read from stdin"
msgstr "Kunde inte läsa från standard in"
msgid "could not read from stdin"
msgstr "Kunde inte läsa från standard in"
@@
-1517,26
+1526,26
@@
msgstr "felaktigt portnummer"
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: wrapper.c:5
09
+#: wrapper.c:5
23
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: wrapper.c:5
30
+#: wrapper.c:5
44
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:5
41
+#: wrapper.c:5
55
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-#: wrapper.c:5
42
+#: wrapper.c:5
56
msgid "no such user"
msgstr "okänd användare"
msgid "no such user"
msgstr "okänd användare"
-#: wrapper.c:5
50
+#: wrapper.c:5
64
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
@@
-1565,11
+1574,11
@@
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:198
+#: wt-status.c:198
wt-status.c:878
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:216
+#: wt-status.c:216
wt-status.c:887
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
@@
-1683,15
+1692,15
@@
msgstr "ospårat innehåll, "
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
-#: wt-status.c:75
8
+#: wt-status.c:75
3
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:7
60
+#: wt-status.c:7
55
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:83
9
+#: wt-status.c:83
5
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@
-1699,68
+1708,68
@@
msgstr ""
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:9
30
+#: wt-status.c:9
46
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:9
33
+#: wt-status.c:9
49
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:9
36
+#: wt-status.c:9
52
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:9
39
+#: wt-status.c:9
55
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:9
49
+#: wt-status.c:9
65
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:9
52
+#: wt-status.c:9
68
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:9
56
+#: wt-status.c:9
72
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:9
58
+#: wt-status.c:9
74
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:9
60
+#: wt-status.c:9
76
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:10
20 wt-status.c:1037
+#: wt-status.c:10
36 wt-status.c:1053
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:10
25 wt-status.c:1042
+#: wt-status.c:10
41 wt-status.c:1058
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:10
28
+#: wt-status.c:10
44
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:10
30
+#: wt-status.c:10
46
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:10
32
+#: wt-status.c:10
48
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:10
45
+#: wt-status.c:10
61
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:10
49
+#: wt-status.c:10
65
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@
-1768,118
+1777,118
@@
msgstr ""
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:10
54
+#: wt-status.c:10
70
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:10
57
+#: wt-status.c:10
73
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:10
61
+#: wt-status.c:10
77
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:10
66
+#: wt-status.c:10
82
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:10
69
+#: wt-status.c:10
85
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:10
71
+#: wt-status.c:10
87
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:10
81
+#: wt-status.c:10
97
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1
086
+#: wt-status.c:1
102
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1
089
+#: wt-status.c:1
105
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1
091
+#: wt-status.c:1
107
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:11
00
+#: wt-status.c:11
16
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:11
05
+#: wt-status.c:11
21
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:11
08
+#: wt-status.c:11
24
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:11
10
+#: wt-status.c:11
26
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:11
21
+#: wt-status.c:11
37
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:11
25
+#: wt-status.c:11
41
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:11
28
+#: wt-status.c:11
44
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:13
03
+#: wt-status.c:13
21
msgid "On branch "
msgstr "På grenen "
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:13
10
+#: wt-status.c:13
28
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:13
17
+#: wt-status.c:13
33
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:13
19
+#: wt-status.c:13
35
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:13
22
+#: wt-status.c:13
38
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:13
39
+#: wt-status.c:13
55
msgid "Initial commit"
msgstr "Första incheckning"
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:13
53
+#: wt-status.c:13
69
msgid "Untracked files"
msgstr "Ospårade filer"
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:13
55
+#: wt-status.c:13
71
msgid "Ignored files"
msgstr "Ignorerade filer"
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:13
59
+#: wt-status.c:13
75
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@
-1891,32
+1900,32
@@
msgstr ""
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:13
65
+#: wt-status.c:13
81
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:13
67
+#: wt-status.c:13
83
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:13
73
+#: wt-status.c:13
89
msgid "No changes"
msgstr "Inga ändringar"
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:13
78
+#: wt-status.c:13
94
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:13
81
+#: wt-status.c:13
97
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1
384
+#: wt-status.c:1
400
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@
-1925,44
+1934,44
@@
msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1
387
+#: wt-status.c:1
403
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1
390
+#: wt-status.c:1
406
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1
393 wt-status.c:1398
+#: wt-status.c:1
409 wt-status.c:1414
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1
396
+#: wt-status.c:1
412
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:14
00
+#: wt-status.c:14
16
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:15
09
+#: wt-status.c:15
25
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:15
15
+#: wt-status.c:15
31
msgid "Initial commit on "
msgstr "Första incheckning på "
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:15
47
+#: wt-status.c:15
63
msgid "gone"
msgstr "försvunnen"
msgid "gone"
msgstr "försvunnen"
-#: wt-status.c:15
49 wt-status.c:1557
+#: wt-status.c:15
65 wt-status.c:1573
msgid "behind "
msgstr "efter "
msgid "behind "
msgstr "efter "
@@
-1972,8
+1981,8
@@
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
#: builtin/add.c:22
msgstr "misslyckades ta bort länken \"%s\""
#: builtin/add.c:22
-msgid "git add [
options
] [--] <pathspec>..."
-msgstr "git add [
flaggor
] [--] <sökväg>..."
+msgid "git add [
<options>
] [--] <pathspec>..."
+msgstr "git add [
<flaggor>
] [--] <sökväg>..."
#: builtin/add.c:65
#, c-format
#: builtin/add.c:65
#, c-format
@@
-2024,14
+2033,14
@@
msgstr "Kunde inte tillämpa \"%s\""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:248 builtin/clean.c:87
5 builtin/fetch.c:108
builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/push.c:
499
builtin/remote.c:1372
+#: builtin/add.c:248 builtin/clean.c:87
6 builtin/fetch.c:107
builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:
508
builtin/remote.c:1372
#: builtin/rm.c:269
msgid "dry run"
msgstr "testkörning"
#: builtin/rm.c:269
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:249 builtin/apply.c:4
41
5 builtin/check-ignore.c:19
-#: builtin/commit.c:132
6
builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/add.c:249 builtin/apply.c:4
57
5 builtin/check-ignore.c:19
+#: builtin/commit.c:132
0
builtin/count-objects.c:63 builtin/fsck.c:608
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
@@
-2107,75
+2116,75
@@
msgstr "Inget angivet, inget tillagt.\n"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:9
19
+#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:9
20
#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "indexfilen trasig"
#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:446 builtin/apply.c:4
510
builtin/mv.c:279 builtin/rm.c:431
+#: builtin/add.c:446 builtin/apply.c:4
673
builtin/mv.c:279 builtin/rm.c:431
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"
-#: builtin/apply.c:5
8
-msgid "git apply [
options
] [<patch>...]"
-msgstr "git apply [
flaggor
] [<patch>...]"
+#: builtin/apply.c:5
9
+msgid "git apply [
<options>
] [<patch>...]"
+msgstr "git apply [
<flaggor>
] [<patch>...]"
-#: builtin/apply.c:11
1
+#: builtin/apply.c:11
2
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: builtin/apply.c:12
6
+#: builtin/apply.c:12
7
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: builtin/apply.c:82
6
+#: builtin/apply.c:82
2
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: builtin/apply.c:83
5
+#: builtin/apply.c:83
1
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: builtin/apply.c:91
6
+#: builtin/apply.c:91
2
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: builtin/apply.c:94
8
+#: builtin/apply.c:94
4
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: builtin/apply.c:9
52
+#: builtin/apply.c:9
48
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: builtin/apply.c:9
53
+#: builtin/apply.c:9
49
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: builtin/apply.c:9
60
+#: builtin/apply.c:9
56
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: builtin/apply.c:14
23
+#: builtin/apply.c:14
19
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: builtin/apply.c:14
80
+#: builtin/apply.c:14
76
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: builtin/apply.c:149
7
+#: builtin/apply.c:149
3
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@
-2191,77
+2200,77
@@
msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: builtin/apply.c:165
7
+#: builtin/apply.c:165
6
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: builtin/apply.c:165
9
+#: builtin/apply.c:165
8
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: builtin/apply.c:168
5
+#: builtin/apply.c:168
4
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: builtin/apply.c:172
1
+#: builtin/apply.c:172
0
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: builtin/apply.c:172
3
+#: builtin/apply.c:172
2
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: builtin/apply.c:172
6
+#: builtin/apply.c:172
5
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: builtin/apply.c:187
2
+#: builtin/apply.c:187
1
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: builtin/apply.c:190
1
+#: builtin/apply.c:190
0
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: builtin/apply.c:205
2
+#: builtin/apply.c:205
1
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: builtin/apply.c:214
2
+#: builtin/apply.c:214
1
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/apply.c:214
6
+#: builtin/apply.c:214
5
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: builtin/apply.c:27
54
+#: builtin/apply.c:27
78
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: builtin/apply.c:28
72
+#: builtin/apply.c:28
96
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: builtin/apply.c:2
884
+#: builtin/apply.c:2
908
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: builtin/apply.c:2
890
+#: builtin/apply.c:2
914
#, c-format
msgid ""
"while searching for:\n"
#, c-format
msgid ""
"while searching for:\n"
@@
-2270,317
+2279,336
@@
msgstr ""
"vid sökning efter:\n"
"%.*s"
"vid sökning efter:\n"
"%.*s"
-#: builtin/apply.c:29
09
+#: builtin/apply.c:29
33
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: builtin/apply.c:30
10
+#: builtin/apply.c:30
34
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: builtin/apply.c:30
16
+#: builtin/apply.c:30
40
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: builtin/apply.c:30
37
+#: builtin/apply.c:30
61
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: builtin/apply.c:31
61
+#: builtin/apply.c:31
85
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: builtin/apply.c:32
06 builtin/apply.c:3215 builtin/apply.c:3260
+#: builtin/apply.c:32
30 builtin/apply.c:3241 builtin/apply.c:3286
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
-#: builtin/apply.c:3240 builtin/apply.c:3462
+#: builtin/apply.c:3238
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
+
+#: builtin/apply.c:3266 builtin/apply.c:3488
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: builtin/apply.c:33
21 builtin/apply.c:3476
+#: builtin/apply.c:33
47 builtin/apply.c:3502
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: builtin/apply.c:33
25 builtin/apply.c:3468 builtin/apply.c:3490
+#: builtin/apply.c:33
51 builtin/apply.c:3494 builtin/apply.c:3516
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:33
30 builtin/apply.c:3484
+#: builtin/apply.c:33
56 builtin/apply.c:3510
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: builtin/apply.c:34
32
+#: builtin/apply.c:34
58
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: builtin/apply.c:35
01
+#: builtin/apply.c:35
27
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: builtin/apply.c:35
03
+#: builtin/apply.c:35
29
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: builtin/apply.c:3604
+#: builtin/apply.c:3688 builtin/apply.c:3690
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ogiltig sökväg: %s"
+
+#: builtin/apply.c:3745
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: builtin/apply.c:3
607
+#: builtin/apply.c:3
748
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: builtin/apply.c:3
627
+#: builtin/apply.c:3
768
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: builtin/apply.c:3
632
+#: builtin/apply.c:3
773
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: builtin/apply.c:3640
+#: builtin/apply.c:3793
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
+
+#: builtin/apply.c:3797
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: builtin/apply.c:3
653
+#: builtin/apply.c:3
811
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3
746
builtin/checkout.c:231 builtin/reset.c:135
+#: builtin/apply.c:3
904
builtin/checkout.c:231 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:
3889
+#: builtin/apply.c:
4047
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:
3918
+#: builtin/apply.c:
4076
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: builtin/apply.c:
3922
+#: builtin/apply.c:
4080
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:
3927
+#: builtin/apply.c:
4085
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: builtin/apply.c:
3930 builtin/apply.c:4038
+#: builtin/apply.c:
4088 builtin/apply.c:4196
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:
3963
+#: builtin/apply.c:
4121
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:4
012
+#: builtin/apply.c:4
170
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:4
099
+#: builtin/apply.c:4
257
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:4
107
+#: builtin/apply.c:4
265
msgid "internal error"
msgstr "internt fel"
msgid "internal error"
msgstr "internt fel"
-#: builtin/apply.c:4
110
+#: builtin/apply.c:4
268
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: builtin/apply.c:4
120
+#: builtin/apply.c:4
278
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4
141
+#: builtin/apply.c:4
299
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4
144
+#: builtin/apply.c:4
302
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4
234
+#: builtin/apply.c:4
392
msgid "unrecognized input"
msgstr "indata känns inte igen"
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4
245
+#: builtin/apply.c:4
403
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4
362 builtin/apply.c:4365
builtin/clone.c:92
-#: builtin/fetch.c:9
3
+#: builtin/apply.c:4
520 builtin/apply.c:4523
builtin/clone.c:92
+#: builtin/fetch.c:9
2
msgid "path"
msgstr "sökväg"
msgid "path"
msgstr "sökväg"
-#: builtin/apply.c:4
363
+#: builtin/apply.c:4
521
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4
366
+#: builtin/apply.c:4
524
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"
-#: builtin/apply.c:4
368
+#: builtin/apply.c:4
526
msgid "num"
msgstr "antal"
msgid "num"
msgstr "antal"
-#: builtin/apply.c:4
369
+#: builtin/apply.c:4
527
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: builtin/apply.c:4
372
+#: builtin/apply.c:4
530
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4
374
+#: builtin/apply.c:4
532
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: builtin/apply.c:4
378
+#: builtin/apply.c:4
536
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4
380
+#: builtin/apply.c:4
538
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: builtin/apply.c:4
382
+#: builtin/apply.c:4
540
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: builtin/apply.c:4
384
+#: builtin/apply.c:4
542
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: builtin/apply.c:4
386
+#: builtin/apply.c:4
544
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4388
+#: builtin/apply.c:4546
+msgid "accept a patch that touches outside the working area"
+msgstr "godta en patch som rör filer utanför arbetskatalogen"
+
+#: builtin/apply.c:4548
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4
39
0
+#: builtin/apply.c:4
55
0
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: builtin/apply.c:4
39
2
+#: builtin/apply.c:4
55
2
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"
-#: builtin/apply.c:4
394 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4
554 builtin/checkout-index.c:198 builtin/ls-files.c:412
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"
-#: builtin/apply.c:4
39
7
+#: builtin/apply.c:4
55
7
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"
-#: builtin/apply.c:4
39
8
+#: builtin/apply.c:4
55
8
msgid "action"
msgstr "åtgärd"
msgid "action"
msgstr "åtgärd"
-#: builtin/apply.c:4
39
9
+#: builtin/apply.c:4
55
9
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4
402 builtin/apply.c:440
5
+#: builtin/apply.c:4
562 builtin/apply.c:456
5
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4
40
8
+#: builtin/apply.c:4
56
8
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4
41
0
+#: builtin/apply.c:4
57
0
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4
41
2
+#: builtin/apply.c:4
57
2
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4
41
4
+#: builtin/apply.c:4
57
4
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4
41
7
+#: builtin/apply.c:4
57
7
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4
42
0
+#: builtin/apply.c:4
58
0
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"
-#: builtin/apply.c:4
42
2
+#: builtin/apply.c:4
58
2
msgid "root"
msgstr "rot"
msgid "root"
msgstr "rot"
-#: builtin/apply.c:4
42
3
+#: builtin/apply.c:4
58
3
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4
44
5
+#: builtin/apply.c:4
60
5
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: builtin/apply.c:4
45
3
+#: builtin/apply.c:4
61
3
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: builtin/apply.c:4
45
6
+#: builtin/apply.c:4
61
6
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: builtin/apply.c:4
472
+#: builtin/apply.c:4
635
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
-#: builtin/apply.c:4
486
+#: builtin/apply.c:4
649
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: builtin/apply.c:4
492 builtin/apply.c:4502
+#: builtin/apply.c:4
655 builtin/apply.c:4665
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@
-2635,102
+2663,102
@@
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
#: builtin/blame.c:30
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
#: builtin/blame.c:30
-msgid "git blame [
options] [rev-opts] [rev
] [--] file"
-msgstr "git blame [
flaggor] [rev-flaggor] [rev
] [--] fil"
+msgid "git blame [
<options>] [<rev-opts>] [<rev>
] [--] file"
+msgstr "git blame [
<flaggor>] [<rev-flaggor>] [<rev>
] [--] fil"
#: builtin/blame.c:35
#: builtin/blame.c:35
-msgid "
[rev-opts]
are documented in git-rev-list(1)"
-msgstr "
[rev-flaggor]
dokumenteras i git-rev-list(1)"
+msgid "
<rev-opts>
are documented in git-rev-list(1)"
+msgstr "
<rev-flaggor>
dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:250
1
+#: builtin/blame.c:250
0
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:250
2
+#: builtin/blame.c:250
1
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:250
3
+#: builtin/blame.c:250
2
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:250
4
+#: builtin/blame.c:250
3
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:250
5
+#: builtin/blame.c:250
4
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:250
6
+#: builtin/blame.c:250
5
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:250
7
+#: builtin/blame.c:250
6
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:250
8
+#: builtin/blame.c:250
7
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:250
9
+#: builtin/blame.c:250
8
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:25
10
+#: builtin/blame.c:25
09
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:251
1
+#: builtin/blame.c:251
0
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:251
2
+#: builtin/blame.c:251
1
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:251
3
+#: builtin/blame.c:251
2
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:251
4
+#: builtin/blame.c:251
3
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:251
5
+#: builtin/blame.c:251
4
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:251
6
+#: builtin/blame.c:251
5
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:251
7
+#: builtin/blame.c:251
6
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:251
8
+#: builtin/blame.c:251
7
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:251
9 builtin/blame.c:2520
+#: builtin/blame.c:251
8 builtin/blame.c:2519
msgid "score"
msgstr "poäng"
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:251
9
+#: builtin/blame.c:251
8
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:25
20
+#: builtin/blame.c:25
19
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:252
1
+#: builtin/blame.c:252
0
msgid "n,m"
msgstr "n,m"
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:252
1
+#: builtin/blame.c:252
0
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@
-2740,25
+2768,25
@@
msgstr "Behandla endast radintervallet n,m, med början på 1"
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
#. takes 22 places, is the longest among various forms of
#. relative timestamps, but your language may need more or
#. fewer display columns.
-#: builtin/blame.c:260
2
+#: builtin/blame.c:260
1
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
#: builtin/branch.c:24
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
#: builtin/branch.c:24
-msgid "git branch [
options
] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [
flaggor
] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [
<options>
] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [
<flaggor>
] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:25
#: builtin/branch.c:25
-msgid "git branch [
options] [-l] [-f] <branch
name> [<start-point>]"
-msgstr "git branch [
flaggor
] [-l] [-f] <grennamn> [<startpunkt>]"
+msgid "git branch [
<options>] [-l] [-f] <branch-
name> [<start-point>]"
+msgstr "git branch [
<flaggor>
] [-l] [-f] <grennamn> [<startpunkt>]"
#: builtin/branch.c:26
#: builtin/branch.c:26
-msgid "git branch [
options] [-r] (-d | -D) <branch
name>..."
-msgstr "git branch [
flaggor
] [-r] (-d | -D) <grennamn>..."
+msgid "git branch [
<options>] [-r] (-d | -D) <branch-
name>..."
+msgstr "git branch [
<flaggor>
] [-r] (-d | -D) <grennamn>..."
#: builtin/branch.c:27
#: builtin/branch.c:27
-msgid "git branch [
options] (-m | -M) [<oldbranch>] <new
branch>"
-msgstr "git branch [
flaggor
] (-m | -M) [<gammal_gren>] <ny_gren>"
+msgid "git branch [
<options>] (-m | -M) [<old-branch>] <new-
branch>"
+msgstr "git branch [
<flaggor>
] (-m | -M) [<gammal_gren>] <ny_gren>"
#: builtin/branch.c:152
#, c-format
#: builtin/branch.c:152
#, c-format
@@
-2898,237
+2926,242
@@
msgstr "(ingen gren, ombaserar %s)"
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: builtin/branch.c:59
3
+#: builtin/branch.c:59
6
#, c-format
#, c-format
-msgid "(
detached from
%s)"
-msgstr "(
frånkopplad från
%s)"
+msgid "(
HEAD detached at
%s)"
+msgstr "(
HEAD frånkopplat vid
%s)"
-#: builtin/branch.c:596
+#: builtin/branch.c:599
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
+
+#: builtin/branch.c:603
msgid "(no branch)"
msgstr "(ingen gren)"
msgid "(no branch)"
msgstr "(ingen gren)"
-#: builtin/branch.c:6
43
+#: builtin/branch.c:6
50
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "objektet \"%s\" pekar på en incheckning"
#, c-format
msgid "object '%s' does not point to a commit"
msgstr "objektet \"%s\" pekar på en incheckning"
-#: builtin/branch.c:69
1
+#: builtin/branch.c:69
8
msgid "some refs could not be read"
msgstr "vissa referenser kunde inte läsas"
msgid "some refs could not be read"
msgstr "vissa referenser kunde inte läsas"
-#: builtin/branch.c:7
04
+#: builtin/branch.c:7
11
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:7
14
+#: builtin/branch.c:7
21
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:7
29
+#: builtin/branch.c:7
36
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:7
33
+#: builtin/branch.c:7
40
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:7
37
+#: builtin/branch.c:7
44
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:7
44
+#: builtin/branch.c:7
51
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:7
59
+#: builtin/branch.c:7
66
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: builtin/branch.c:7
83
+#: builtin/branch.c:7
90
#, c-format
msgid "could not write branch description template: %s"
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
#, c-format
msgid "could not write branch description template: %s"
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
-#: builtin/branch.c:8
13
+#: builtin/branch.c:8
20
msgid "Generic options"
msgstr "Allmänna flaggor"
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:8
15
+#: builtin/branch.c:8
22
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:8
16
+#: builtin/branch.c:8
23
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:8
17
+#: builtin/branch.c:8
24
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:8
19
+#: builtin/branch.c:8
26
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:8
23
+#: builtin/branch.c:8
30
msgid "use colored output"
msgstr "använd färgad utdata"
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:8
24
+#: builtin/branch.c:8
31
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:8
27 builtin/branch.c:833 builtin/branch.c:854
-#: builtin/branch.c:86
0 builtin/commit.c:1586 builtin/commit.c:1587
-#: builtin/commit.c:158
8 builtin/commit.c:1589
builtin/tag.c:616
+#: builtin/branch.c:8
34 builtin/branch.c:840 builtin/branch.c:861
+#: builtin/branch.c:86
7 builtin/commit.c:1580 builtin/commit.c:1581
+#: builtin/commit.c:158
2 builtin/commit.c:1583
builtin/tag.c:616
#: builtin/tag.c:622
msgid "commit"
msgstr "incheckning"
#: builtin/tag.c:622
msgid "commit"
msgstr "incheckning"
-#: builtin/branch.c:8
28 builtin/branch.c:834
+#: builtin/branch.c:8
35 builtin/branch.c:841
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:84
0
+#: builtin/branch.c:84
7
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:84
1
+#: builtin/branch.c:84
8
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:8
43
+#: builtin/branch.c:8
50
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:8
44
+#: builtin/branch.c:8
51
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:8
45
+#: builtin/branch.c:8
52
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:8
46
+#: builtin/branch.c:8
53
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:8
47
+#: builtin/branch.c:8
54
msgid "list branch names"
msgstr "lista namn på grenar"
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:8
48
+#: builtin/branch.c:8
55
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:85
0
+#: builtin/branch.c:85
7
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:85
1
+#: builtin/branch.c:85
8
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:8
54
+#: builtin/branch.c:8
61
msgid "print only not merged branches"
msgstr "visa endast ej sammanslagna grenar"
msgid "print only not merged branches"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:86
0
+#: builtin/branch.c:86
7
msgid "print only merged branches"
msgstr "visa endast sammanslagna grenar"
msgid "print only merged branches"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:8
64
+#: builtin/branch.c:8
71
msgid "list branches in columns"
msgstr "visa grenar i spalter"
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:8
77
+#: builtin/branch.c:8
84
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:88
1
builtin/clone.c:637
+#: builtin/branch.c:88
8
builtin/clone.c:637
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:9
03
+#: builtin/branch.c:9
10
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:9
14 builtin/branch.c:953
+#: builtin/branch.c:9
21 builtin/branch.c:960
msgid "branch name required"
msgstr "grennamn krävs"
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:9
29
+#: builtin/branch.c:9
36
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:9
34
+#: builtin/branch.c:9
41
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:94
1
+#: builtin/branch.c:94
8
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:9
44
+#: builtin/branch.c:9
51
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:9
59
+#: builtin/branch.c:9
66
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:9
64
+#: builtin/branch.c:9
71
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:9
68
+#: builtin/branch.c:9
75
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:97
1 builtin/branch.c:993 builtin/branch.c:1014
+#: builtin/branch.c:97
8 builtin/branch.c:1000 builtin/branch.c:1021
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:9
75
+#: builtin/branch.c:9
82
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:9
87
+#: builtin/branch.c:9
94
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:99
1
+#: builtin/branch.c:99
8
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:
997
+#: builtin/branch.c:
1004
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:101
1
+#: builtin/branch.c:101
8
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:10
17
+#: builtin/branch.c:10
24
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:102
0
+#: builtin/branch.c:102
7
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@
-3137,7
+3170,7
@@
msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:10
37
+#: builtin/branch.c:10
44
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-3148,12
+3181,12
@@
msgstr ""
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/branch.c:10
38
+#: builtin/branch.c:10
45
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:10
39
+#: builtin/branch.c:10
46
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
@@
-3171,53
+3204,53
@@
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:32
8
-msgid "git cat-file (-t
|-s|-e|-p|<type>|
--textconv) <object>"
-msgstr "git cat-file (-t
|-s|-e|-p|<typ>|
--textconv) <objekt>"
+#: builtin/cat-file.c:32
6
+msgid "git cat-file (-t
| -s | -e | -p | <type> |
--textconv) <object>"
+msgstr "git cat-file (-t
| -s | -e | -p | <typ> |
--textconv) <objekt>"
-#: builtin/cat-file.c:32
9
-msgid "git cat-file (--batch
|--batch-check) < <list_of_
objects>"
-msgstr "git cat-file (--batch
|
--batch-check) < <objektlista>"
+#: builtin/cat-file.c:32
7
+msgid "git cat-file (--batch
| --batch-check) < <list-of-
objects>"
+msgstr "git cat-file (--batch
|
--batch-check) < <objektlista>"
-#: builtin/cat-file.c:36
6
+#: builtin/cat-file.c:36
4
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:36
7
+#: builtin/cat-file.c:36
5
msgid "show object type"
msgstr "visa objekttyp"
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:36
8
+#: builtin/cat-file.c:36
6
msgid "show object size"
msgstr "visa objektstorlek"
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:3
70
+#: builtin/cat-file.c:3
68
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:3
71
+#: builtin/cat-file.c:3
69
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:37
3
+#: builtin/cat-file.c:37
1
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör textconv på objektets innehåll"
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör textconv på objektets innehåll"
-#: builtin/cat-file.c:37
5
+#: builtin/cat-file.c:37
3
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:37
8
+#: builtin/cat-file.c:37
6
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
#: builtin/check-attr.c:11
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all |
attr...] [--] pathname
..."
-msgstr "git check-attr [-a | --all |
attr...] [--] sökväg
..."
+msgid "git check-attr [-a | --all |
<attr>...] [--] <pathname>
..."
+msgstr "git check-attr [-a | --all |
<attr>...] [--] <sökväg>
..."
#: builtin/check-attr.c:12
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all |
attr
...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all |
attr
...] < <sökvägslista>"
+msgid "git check-attr --stdin [-z] [-a | --all |
<attr>
...] < <list-of-paths>"
+msgstr "git check-attr --stdin [-z] [-a | --all |
<attr>
...] < <sökvägslista>"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@
-3272,8
+3305,8
@@
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching är endast giltig med --verbose"
#: builtin/check-mailmap.c:8
msgstr "--non-matching är endast giltig med --verbose"
#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [
options
] <contact>..."
-msgstr "git check-mailmap [
flaggor
] <kontakt>..."
+msgid "git check-mailmap [
<options>
] <contact>..."
+msgstr "git check-mailmap [
<flaggor>
] <kontakt>..."
#: builtin/check-mailmap.c:13
msgid "also read contacts from stdin"
#: builtin/check-mailmap.c:13
msgid "also read contacts from stdin"
@@
-3289,8
+3322,8
@@
msgid "no contacts specified"
msgstr "inga kontakter angavs"
#: builtin/checkout-index.c:126
msgstr "inga kontakter angavs"
#: builtin/checkout-index.c:126
-msgid "git checkout-index [
options
] [--] [<file>...]"
-msgstr "git checkout-index [
flaggor
] [--] [<fil>...]"
+msgid "git checkout-index [
<options>
] [--] [<file>...]"
+msgstr "git checkout-index [
<flaggor>
] [--] [<fil>...]"
#: builtin/checkout-index.c:188
msgid "check out all files in the index"
#: builtin/checkout-index.c:188
msgid "check out all files in the index"
@@
-3333,12
+3366,12
@@
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
#: builtin/checkout.c:25
msgstr "kopiera ut filer från namngiven etapp"
#: builtin/checkout.c:25
-msgid "git checkout [
options
] <branch>"
-msgstr "git checkout [
flaggor
] <gren>"
+msgid "git checkout [
<options>
] <branch>"
+msgstr "git checkout [
<flaggor>
] <gren>"
#: builtin/checkout.c:26
#: builtin/checkout.c:26
-msgid "git checkout [
options
] [<branch>] -- <file>..."
-msgstr "git checkout [
flaggor
] [<gren>] -- <fil>..."
+msgid "git checkout [
<options>
] [<branch>] -- <file>..."
+msgstr "git checkout [
<flaggor>
] [<gren>] -- <fil>..."
#: builtin/checkout.c:132 builtin/checkout.c:165
#, c-format
#: builtin/checkout.c:132 builtin/checkout.c:165
#, c-format
@@
-3467,13
+3500,13
@@
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
-" git branch
new_branch_name
%s\n"
+" git branch
<new-branch-name>
%s\n"
"\n"
msgstr ""
"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"
"att göra så, med:\n"
"\n"
"\n"
msgstr ""
"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"
"att göra så, med:\n"
"\n"
-" git branch
nytt_grennamn
%s\n"
+" git branch
<nytt_grennamn>
%s\n"
"\n"
#: builtin/checkout.c:777
"\n"
#: builtin/checkout.c:777
@@
-3589,8
+3622,8
@@
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
#: builtin/checkout.c:1130
msgstr "begränsa inte sökvägar till endast glesa poster"
#: builtin/checkout.c:1130
-msgid "second guess 'git checkout
no-such-branch
'"
-msgstr "förutspå \"git checkout
gren-saknas
\""
+msgid "second guess 'git checkout
<no-such-branch>
'"
+msgstr "förutspå \"git checkout
<gren-saknas>
\""
#: builtin/checkout.c:1153
msgid "-b, -B and --orphan are mutually exclusive"
#: builtin/checkout.c:1153
msgid "-b, -B and --orphan are mutually exclusive"
@@
-3713,16
+3746,17
@@
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
-#: builtin/clean.c:757
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
#, c-format
#, c-format
-msgid "
remove %s
? "
-msgstr "
ta bort %s
?"
+msgid "
Remove %s [y/N]
? "
+msgstr "
Ta bort %s [Y=ja / N=nej]
?"
-#: builtin/clean.c:78
2
+#: builtin/clean.c:78
3
msgid "Bye."
msgstr "Hej då."
msgid "Bye."
msgstr "Hej då."
-#: builtin/clean.c:79
0
+#: builtin/clean.c:79
1
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@
-3740,62
+3774,62
@@
msgstr ""
"help - denna skärm\n"
"? - hjälp för kommandoval"
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:81
7
+#: builtin/clean.c:81
8
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:81
8
+#: builtin/clean.c:81
9
msgid "What now"
msgstr "Vad nu"
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:82
6
+#: builtin/clean.c:82
7
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:84
3
+#: builtin/clean.c:84
4
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:87
4
+#: builtin/clean.c:87
5
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:87
6
+#: builtin/clean.c:87
7
msgid "force"
msgstr "tvinga"
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:87
7
+#: builtin/clean.c:87
8
msgid "interactive cleaning"
msgstr "städa interaktivt"
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:8
79
+#: builtin/clean.c:8
80
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:88
0
builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:4
86
builtin/name-rev.c:311 builtin/show-ref.c:185
+#: builtin/clean.c:88
1
builtin/describe.c:407 builtin/grep.c:714
+#: builtin/ls-files.c:4
43
builtin/name-rev.c:311 builtin/show-ref.c:185
msgid "pattern"
msgstr "mönster"
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:88
1
+#: builtin/clean.c:88
2
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:88
2
+#: builtin/clean.c:88
3
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:88
4
+#: builtin/clean.c:88
5
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:90
2
+#: builtin/clean.c:90
3
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:90
6
+#: builtin/clean.c:90
7
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@
-3803,7
+3837,7
@@
msgstr ""
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:9
09
+#: builtin/clean.c:9
10
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@
-3812,11
+3846,11
@@
msgstr ""
"angavs; vägrar städa"
#: builtin/clone.c:37
"angavs; vägrar städa"
#: builtin/clone.c:37
-msgid "git clone [
options
] [--] <repo> [<dir>]"
-msgstr "git clone [
flaggor
] [--] <arkiv> [<kat>]"
+msgid "git clone [
<options>
] [--] <repo> [<dir>]"
+msgstr "git clone [
<flaggor>
] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:66 builtin/fetch.c:11
2
builtin/merge.c:224
-#: builtin/push.c:5
14
+#: builtin/clone.c:66 builtin/fetch.c:11
1
builtin/merge.c:224
+#: builtin/push.c:5
23
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
@@
-3876,7
+3910,7
@@
msgstr "checka ut <gren> istället för fjärrens HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:94 builtin/fetch.c:11
3
builtin/grep.c:659
+#: builtin/clone.c:94 builtin/fetch.c:11
2
builtin/grep.c:659
msgid "depth"
msgstr "djup"
msgid "depth"
msgstr "djup"
@@
-4023,7
+4057,7
@@
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:815 builtin/fetch.c:115
5
+#: builtin/clone.c:815 builtin/fetch.c:115
6
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
@@
-4038,59
+4072,59
@@
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:8
48 builtin/clone.c:860
+#: builtin/clone.c:8
50 builtin/clone.c:861
#, 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\""
-#: builtin/clone.c:85
1
+#: builtin/clone.c:85
3
#, c-format
#, c-format
-msgid "could not create work tree dir '%s'
.
"
+msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:87
0
+#: builtin/clone.c:87
1
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:87
2
+#: builtin/clone.c:87
3
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:89
7
+#: builtin/clone.c:89
8
msgid "--dissociate given, but there is no --reference"
msgstr "--dissociate angavs, men --reference har inte angivits"
msgid "--dissociate given, but there is no --reference"
msgstr "--dissociate angavs, men --reference har inte angivits"
-#: builtin/clone.c:91
2
+#: builtin/clone.c:91
3
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:91
5
+#: builtin/clone.c:91
6
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:92
0
+#: builtin/clone.c:92
1
msgid "--local is ignored"
msgstr "--local ignoreras"
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:92
4
+#: builtin/clone.c:92
5
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:97
5 builtin/clone.c:983
+#: builtin/clone.c:97
6 builtin/clone.c:984
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:98
6
+#: builtin/clone.c:98
7
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
#: builtin/column.c:9
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
#: builtin/column.c:9
-msgid "git column [
options
]"
-msgstr "git column [
flaggor
]"
+msgid "git column [
<options>
]"
+msgstr "git column [
<flaggor>
]"
#: builtin/column.c:26
msgid "lookup config vars"
#: builtin/column.c:26
msgid "lookup config vars"
@@
-4121,12
+4155,12
@@
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
#: builtin/commit.c:37
msgstr "--command måste vara första argument"
#: builtin/commit.c:37
-msgid "git commit [
options
] [--] <pathspec>..."
-msgstr "git commit [
flaggor
] [--] <sökväg>..."
+msgid "git commit [
<options>
] [--] <pathspec>..."
+msgstr "git commit [
<flaggor>
] [--] <sökväg>..."
#: builtin/commit.c:42
#: builtin/commit.c:42
-msgid "git status [
options
] [--] <pathspec>..."
-msgstr "git status [
flaggor
] [--] <sökväg>..."
+msgid "git status [
<options>
] [--] <pathspec>..."
+msgstr "git status [
<flaggor>
] [--] <sökväg>..."
#: builtin/commit.c:47
msgid ""
#: builtin/commit.c:47
msgid ""
@@
-4268,26
+4302,26
@@
msgstr "kan inte läsa indexet"
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:5
84
+#: builtin/commit.c:5
78
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:58
6
+#: builtin/commit.c:58
0
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:
605
+#: builtin/commit.c:
599
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:6
13
+#: builtin/commit.c:6
07
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:65
7
+#: builtin/commit.c:65
1
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@
-4295,43
+4329,43
@@
msgstr ""
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:6
94 builtin/commit.c:727 builtin/commit.c:1084
+#: builtin/commit.c:6
88 builtin/commit.c:721 builtin/commit.c:1078
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:70
6
builtin/shortlog.c:273
+#: builtin/commit.c:70
0
builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:70
8
+#: builtin/commit.c:70
2
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:7
12
+#: builtin/commit.c:7
06
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:7
34
+#: builtin/commit.c:7
28
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:73
8
+#: builtin/commit.c:73
2
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:7
42
+#: builtin/commit.c:7
36
#, 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\""
-#: builtin/commit.c:78
9
+#: builtin/commit.c:78
3
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:80
7
+#: builtin/commit.c:80
1
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-4346,7
+4380,7
@@
msgstr ""
"\t%s\n"
"och försöker igen.\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:8
12
+#: builtin/commit.c:8
06
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
@@
-4361,7
+4395,7
@@
msgstr ""
"\t%s\n"
"och försöker igen.\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:8
25
+#: builtin/commit.c:8
19
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@
-4371,7
+4405,7
@@
msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:8
32
+#: builtin/commit.c:8
26
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@
-4382,144
+4416,145
@@
msgstr ""
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:8
52
+#: builtin/commit.c:8
46
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:8
60
+#: builtin/commit.c:8
54
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:86
7
+#: builtin/commit.c:86
1
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:8
85
+#: builtin/commit.c:8
79
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:9
42
+#: builtin/commit.c:9
36
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:95
7
builtin/tag.c:495
+#: builtin/commit.c:95
1
builtin/tag.c:495
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:105
9
+#: builtin/commit.c:105
3
#, c-format
#, c-format
-msgid "No existing author found with '%s'"
-msgstr "Hittade ingen befintlig författare med \"%s\""
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:10
74 builtin/commit.c:1314
+#: builtin/commit.c:10
68 builtin/commit.c:1308
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:11
11
+#: builtin/commit.c:11
05
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:11
41
+#: builtin/commit.c:11
35
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:11
50
+#: builtin/commit.c:11
44
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:11
53
+#: builtin/commit.c:11
47
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:11
55
+#: builtin/commit.c:11
49
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:115
8
+#: builtin/commit.c:115
2
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:116
8
+#: builtin/commit.c:116
2
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:11
70
+#: builtin/commit.c:11
64
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:117
8
+#: builtin/commit.c:117
2
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:11
95
+#: builtin/commit.c:11
89
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:119
7
+#: builtin/commit.c:119
1
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:119
9
+#: builtin/commit.c:119
3
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1
201
+#: builtin/commit.c:1
195
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:12
13
builtin/tag.c:728
+#: builtin/commit.c:12
07
builtin/tag.c:728
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:121
8
+#: builtin/commit.c:121
2
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:132
8 builtin/commit.c:1608
+#: builtin/commit.c:132
2 builtin/commit.c:1602
msgid "show status concisely"
msgstr "visa koncis status"
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:13
30 builtin/commit.c:1610
+#: builtin/commit.c:13
24 builtin/commit.c:1604
msgid "show branch information"
msgstr "visa information om gren"
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:13
32 builtin/commit.c:1612 builtin/push.c:500
+#: builtin/commit.c:13
26 builtin/commit.c:1606 builtin/push.c:509
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:13
35 builtin/commit.c:1614
+#: builtin/commit.c:13
29 builtin/commit.c:1608
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:133
8 builtin/commit.c:1617
+#: builtin/commit.c:133
2 builtin/commit.c:1611
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:13
40 builtin/commit.c:1620
builtin/fast-export.c:980
+#: builtin/commit.c:13
34 builtin/commit.c:1614
builtin/fast-export.c:980
#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "läge"
#: builtin/fast-export.c:983 builtin/tag.c:603
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:13
41 builtin/commit.c:1620
+#: builtin/commit.c:13
35 builtin/commit.c:1614
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:13
44
+#: builtin/commit.c:13
38
msgid "show ignored files"
msgstr "visa ignorerade filer"
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:13
45
parse-options.h:153
+#: builtin/commit.c:13
39
parse-options.h:153
msgid "when"
msgstr "när"
msgid "when"
msgstr "när"
-#: builtin/commit.c:134
6
+#: builtin/commit.c:134
0
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@
-4527,209
+4562,209
@@
msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:134
8
+#: builtin/commit.c:134
2
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:14
35
+#: builtin/commit.c:14
29
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:143
7
+#: builtin/commit.c:143
1
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:14
82
+#: builtin/commit.c:14
76
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:14
85
+#: builtin/commit.c:14
79
msgid " (root-commit)"
msgstr " (rotincheckning)"
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:157
8
+#: builtin/commit.c:157
2
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:157
9
+#: builtin/commit.c:157
3
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:15
81
+#: builtin/commit.c:15
75
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:15
82
builtin/tag.c:601
+#: builtin/commit.c:15
76
builtin/tag.c:601
msgid "read message from file"
msgstr "läs meddelande från fil"
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:15
83
+#: builtin/commit.c:15
77
msgid "author"
msgstr "författare"
msgid "author"
msgstr "författare"
-#: builtin/commit.c:15
83
+#: builtin/commit.c:15
77
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:15
84
builtin/gc.c:275
+#: builtin/commit.c:15
78
builtin/gc.c:275
msgid "date"
msgstr "datum"
msgid "date"
msgstr "datum"
-#: builtin/commit.c:15
84
+#: builtin/commit.c:15
78
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:15
85
builtin/merge.c:218 builtin/notes.c:391
+#: builtin/commit.c:15
79
builtin/merge.c:218 builtin/notes.c:391
#: builtin/notes.c:554 builtin/tag.c:599
msgid "message"
msgstr "meddelande"
#: builtin/notes.c:554 builtin/tag.c:599
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:15
85
+#: builtin/commit.c:15
79
msgid "commit message"
msgstr "incheckningsmeddelande"
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:158
6
+#: builtin/commit.c:158
0
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:158
7
+#: builtin/commit.c:158
1
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:158
8
+#: builtin/commit.c:158
2
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:158
9
+#: builtin/commit.c:158
3
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:15
90
+#: builtin/commit.c:15
84
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:15
91
builtin/log.c:1191 builtin/revert.c:86
+#: builtin/commit.c:15
85
builtin/log.c:1191 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:15
92
+#: builtin/commit.c:15
86
msgid "use specified template file"
msgstr "använd angiven mallfil"
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:15
93
+#: builtin/commit.c:15
87
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:15
94
+#: builtin/commit.c:15
88
msgid "default"
msgstr "standard"
msgid "default"
msgstr "standard"
-#: builtin/commit.c:15
94
builtin/tag.c:604
+#: builtin/commit.c:15
88
builtin/tag.c:604
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:15
95
+#: builtin/commit.c:15
89
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:159
6
builtin/merge.c:225 builtin/revert.c:92
+#: builtin/commit.c:159
0
builtin/merge.c:225 builtin/revert.c:92
#: builtin/tag.c:605
msgid "key-id"
msgstr "nyckel-id"
#: builtin/tag.c:605
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/commit.c:159
7
builtin/merge.c:226 builtin/revert.c:93
+#: builtin/commit.c:159
1
builtin/merge.c:226 builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1
600
+#: builtin/commit.c:1
594
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1
601
+#: builtin/commit.c:1
595
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1
602
+#: builtin/commit.c:1
596
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1
603
+#: builtin/commit.c:1
597
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1
604
+#: builtin/commit.c:1
598
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1
605
+#: builtin/commit.c:1
599
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:160
6
+#: builtin/commit.c:160
0
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
-#: builtin/commit.c:160
7
+#: builtin/commit.c:160
1
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:161
8
+#: builtin/commit.c:161
2
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:161
9
+#: builtin/commit.c:161
3
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:16
24
+#: builtin/commit.c:16
18
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:162
6
+#: builtin/commit.c:162
0
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:16
55
+#: builtin/commit.c:16
49
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:16
94
builtin/merge.c:519
+#: builtin/commit.c:16
88
builtin/merge.c:519
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: builtin/commit.c:1
701
+#: builtin/commit.c:1
695
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:170
8
+#: builtin/commit.c:170
2
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:172
7
+#: builtin/commit.c:172
1
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:173
8
+#: builtin/commit.c:173
2
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:17
43
+#: builtin/commit.c:17
37
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:175
8
builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:175
2
builtin/merge.c:851 builtin/merge.c:876
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/commit.c:17
91
+#: builtin/commit.c:17
85
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@
-4741,8
+4776,8
@@
msgstr ""
"\"git reset HEAD\" för att återställa."
#: builtin/config.c:8
"\"git reset HEAD\" för att återställa."
#: builtin/config.c:8
-msgid "git config [
options
]"
-msgstr "git config [
flaggor
]"
+msgid "git config [
<options>
]"
+msgstr "git config [
<flaggor>
]"
#: builtin/config.c:53
msgid "Config file location"
#: builtin/config.c:53
msgid "Config file location"
@@
-4897,12
+4932,12
@@
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
#: builtin/describe.c:17
msgstr "skriv storlekar i människoläsbart format"
#: builtin/describe.c:17
-msgid "git describe [
options] <commit-ish>*
"
-msgstr "git describe [
flaggor] <incheckning-igt>*
"
+msgid "git describe [
<options>] [<commit-ish>...]
"
+msgstr "git describe [
<flaggor>] [<incheckning-igt>...]
"
#: builtin/describe.c:18
#: builtin/describe.c:18
-msgid "git describe [
options
] --dirty"
-msgstr "git describe [
flaggor
] --dirty"
+msgid "git describe [
<options>
] --dirty"
+msgstr "git describe [
<flaggor>
] --dirty"
#: builtin/describe.c:217
#, c-format
#: builtin/describe.c:217
#, c-format
@@
-5117,177
+5152,177
@@
msgstr "Applicera referensspecifikation på exporterade referenser"
msgid "anonymize output"
msgstr "anonymisera utdata"
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:
20
+#: builtin/fetch.c:
19
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:2
1
+#: builtin/fetch.c:2
0
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:2
2
+#: builtin/fetch.c:2
1
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:2
3
+#: builtin/fetch.c:2
2
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:
90
+#: builtin/fetch.c:
89
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:9
2
+#: builtin/fetch.c:9
1
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:9
4
+#: builtin/fetch.c:9
3
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:9
5
+#: builtin/fetch.c:9
4
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:9
7
+#: builtin/fetch.c:9
6
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:9
9
+#: builtin/fetch.c:9
8
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:10
1
+#: builtin/fetch.c:10
0
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:10
3
+#: builtin/fetch.c:10
2
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:10
4
+#: builtin/fetch.c:10
3
msgid "on-demand"
msgstr "on-demand"
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:10
5
+#: builtin/fetch.c:10
4
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:10
9
+#: builtin/fetch.c:10
8
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:11
1
+#: builtin/fetch.c:11
0
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:11
4
+#: builtin/fetch.c:11
3
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:11
6
+#: builtin/fetch.c:11
5
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:11
8
builtin/log.c:1208
+#: builtin/fetch.c:11
7
builtin/log.c:1208
msgid "dir"
msgstr "kat"
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:11
9
+#: builtin/fetch.c:11
8
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:12
2
+#: builtin/fetch.c:12
1
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:12
4
+#: builtin/fetch.c:12
3
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:12
5
+#: builtin/fetch.c:12
4
msgid "refmap"
msgstr "referenskarta"
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:12
6
+#: builtin/fetch.c:12
5
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:37
6
+#: builtin/fetch.c:37
5
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:45
4
+#: builtin/fetch.c:45
5
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:4
59
+#: builtin/fetch.c:4
60
msgid "[up to date]"
msgstr "[àjour]"
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:47
3
+#: builtin/fetch.c:47
4
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
-#: builtin/fetch.c:47
4 builtin/fetch.c:560
+#: builtin/fetch.c:47
5 builtin/fetch.c:561
msgid "[rejected]"
msgstr "[refuserad]"
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:48
5
+#: builtin/fetch.c:48
6
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:48
7 builtin/fetch.c:522 builtin/fetch.c:540
+#: builtin/fetch.c:48
8 builtin/fetch.c:523 builtin/fetch.c:541
msgid " (unable to update local ref)"
msgstr " (kunde inte uppdatera lokal ref)"
msgid " (unable to update local ref)"
msgstr " (kunde inte uppdatera lokal ref)"
-#: builtin/fetch.c:50
5
+#: builtin/fetch.c:50
6
msgid "[new tag]"
msgstr "[ny tagg]"
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:50
8
+#: builtin/fetch.c:50
9
msgid "[new branch]"
msgstr "[ny gren]"
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:51
1
+#: builtin/fetch.c:51
2
msgid "[new ref]"
msgstr "[ny ref]"
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:55
6
+#: builtin/fetch.c:55
7
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:55
6
+#: builtin/fetch.c:55
7
msgid "forced update"
msgstr "tvingad uppdatering"
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:56
2
+#: builtin/fetch.c:56
3
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
-#: builtin/fetch.c:59
5 builtin/fetch.c:828
+#: builtin/fetch.c:59
6 builtin/fetch.c:829
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: builtin/fetch.c:60
4
+#: builtin/fetch.c:60
5
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:62
2
+#: builtin/fetch.c:62
3
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:71
0 builtin/fetch.c:793
+#: builtin/fetch.c:71
1 builtin/fetch.c:794
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:72
1
+#: builtin/fetch.c:72
2
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@
-5296,55
+5331,55
@@
msgstr ""
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:77
3
+#: builtin/fetch.c:77
4
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:77
4
+#: builtin/fetch.c:77
5
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:79
8
+#: builtin/fetch.c:79
9
msgid "[deleted]"
msgstr "[borttagen]"
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:
799
builtin/remote.c:1060
+#: builtin/fetch.c:
800
builtin/remote.c:1060
msgid "(none)"
msgstr "(ingen)"
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:81
8
+#: builtin/fetch.c:81
9
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:83
7
+#: builtin/fetch.c:83
8
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:84
0
+#: builtin/fetch.c:84
1
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:89
6
+#: builtin/fetch.c:89
7
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:105
8
+#: builtin/fetch.c:105
9
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:106
0
builtin/remote.c:90
+#: builtin/fetch.c:106
1
builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:107
8
+#: builtin/fetch.c:107
9
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@
-5352,39
+5387,40
@@
msgstr ""
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:110
1
+#: builtin/fetch.c:110
2
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:114
3
+#: builtin/fetch.c:114
4
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:114
5
+#: builtin/fetch.c:114
6
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:116
8
+#: builtin/fetch.c:116
9
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:117
0
+#: builtin/fetch.c:117
1
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:118
1
+#: builtin/fetch.c:118
2
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:11
89
+#: builtin/fetch.c:11
90
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
#: builtin/fmt-merge-msg.c:13
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
#: builtin/fmt-merge-msg.c:13
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
msgstr ""
-"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]
|
--no-log] [--file <fil>]"
+"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]
|
--no-log] [--file <fil>]"
#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
@@
-5413,53
+5449,53
@@
msgstr "inled meddelande med <text>"
msgid "file to read from"
msgstr "fil att läsa från"
msgid "file to read from"
msgstr "fil att läsa från"
-#: builtin/for-each-ref.c:67
6
+#: builtin/for-each-ref.c:67
5
msgid "unable to parse format"
msgstr "kan inte tolka formatet"
msgid "unable to parse format"
msgstr "kan inte tolka formatet"
-#: builtin/for-each-ref.c:106
4
-msgid "git for-each-ref [
options
] [<pattern>]"
-msgstr "git for-each-ref [
flaggor
] [<mönster>]"
+#: builtin/for-each-ref.c:106
3
+msgid "git for-each-ref [
<options>
] [<pattern>]"
+msgstr "git for-each-ref [
<flaggor>
] [<mönster>]"
-#: builtin/for-each-ref.c:107
9
+#: builtin/for-each-ref.c:107
8
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:108
1
+#: builtin/for-each-ref.c:108
0
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:108
3
+#: builtin/for-each-ref.c:108
2
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:108
5
+#: builtin/for-each-ref.c:108
4
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:108
8
+#: builtin/for-each-ref.c:108
7
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:108
9
builtin/replace.c:438
+#: builtin/for-each-ref.c:108
8
builtin/replace.c:438
msgid "format"
msgstr "format"
msgid "format"
msgstr "format"
-#: builtin/for-each-ref.c:108
9
+#: builtin/for-each-ref.c:108
8
msgid "format to use for the output"
msgstr "format att använda för utdata"
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/for-each-ref.c:10
90
+#: builtin/for-each-ref.c:10
89
msgid "key"
msgstr "nyckel"
msgid "key"
msgstr "nyckel"
-#: builtin/for-each-ref.c:109
1
+#: builtin/for-each-ref.c:109
0
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:147 builtin/prune.c:13
6
+#: builtin/fsck.c:147 builtin/prune.c:13
7
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
@@
-5468,8
+5504,8
@@
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
#: builtin/fsck.c:603
msgstr "Kontrollerar objektkataloger"
#: builtin/fsck.c:603
-msgid "git fsck [
options
] [<object>...]"
-msgstr "git fsck [
flaggor
] [<objekt>...]"
+msgid "git fsck [
<options>
] [<object>...]"
+msgstr "git fsck [
<flaggor>
] [<objekt>...]"
#: builtin/fsck.c:609
msgid "show unreachable objects"
#: builtin/fsck.c:609
msgid "show unreachable objects"
@@
-5516,8
+5552,8
@@
msgid "Checking objects"
msgstr "Kontrollerar objekt"
#: builtin/gc.c:24
msgstr "Kontrollerar objekt"
#: builtin/gc.c:24
-msgid "git gc [
options
]"
-msgstr "git gc [
flaggor
]"
+msgid "git gc [
<options>
]"
+msgstr "git gc [
<flaggor>
]"
#: builtin/gc.c:79
#, c-format
#: builtin/gc.c:79
#, c-format
@@
-5576,8
+5612,8
@@
msgstr ""
"dem."
#: builtin/grep.c:23
"dem."
#: builtin/grep.c:23
-msgid "git grep [
options
] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [
flaggor
] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
+msgid "git grep [
<options>
] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [
<flaggor>
] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
#: builtin/grep.c:218
#, c-format
#: builtin/grep.c:218
#, c-format
@@
-5617,8
+5653,8
@@
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
#: builtin/grep.c:644
msgstr "sök i både spårade och ospårade filer"
#: builtin/grep.c:644
-msgid "
search also in ignored files
"
-msgstr "
sök även i ignorerade filer
"
+msgid "
ignore files specified via '.gitignore'
"
+msgstr "
ignorera filer angivna i \".gitignore\"
"
#: builtin/grep.c:647
msgid "show non-matching lines"
#: builtin/grep.c:647
msgid "show non-matching lines"
@@
-5802,17
+5838,17
@@
msgstr "både --cached och träd angavs."
#: builtin/hash-object.c:82
msgid ""
#: builtin/hash-object.c:82
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file>
|--no-filters] [--stdin] [--
] "
-"<file>..."
+"git hash-object [-t <type>] [-w] [--path=<file>
| --no-filters] [--stdin
] "
+"
[--]
<file>..."
msgstr ""
msgstr ""
-"git hash-object [-t <typ>] [-w] [--path=<fil>
|
--no-filters] [--stdin] [--] "
+"git hash-object [-t <typ>] [-w] [--path=<fil>
|
--no-filters] [--stdin] [--] "
"<fil>..."
#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr "git hash-object --stdin-paths < <sökvägslista>"
"<fil>..."
#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr "git hash-object --stdin-paths < <sökvägslista>"
-#: builtin/hash-object.c:94 builtin/tag.c:61
0
+#: builtin/hash-object.c:94 builtin/tag.c:61
2
msgid "type"
msgstr "typ"
msgid "type"
msgstr "typ"
@@
-5863,8
+5899,8
@@
msgid "show info page"
msgstr "visa info-sida"
#: builtin/help.c:52
msgstr "visa info-sida"
#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man
|--web|--info] [command
]"
-msgstr "git help [--all] [--guides] [--man
|--web|--info] [kommando
]"
+msgid "git help [--all] [--guides] [--man
| --web | --info] [<command>
]"
+msgstr "git help [--all] [--guides] [--man
| --web | --info] [<kommando>
]"
#: builtin/help.c:64
#, c-format
#: builtin/help.c:64
#, c-format
@@
-6072,8
+6108,8
@@
msgstr "allvarlig inflate-inkonsekvens"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:689 builtin/pack-objects.c:16
4
-#: builtin/pack-objects.c:25
6
+#: builtin/index-pack.c:689 builtin/pack-objects.c:16
2
+#: builtin/pack-objects.c:25
4
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
@@
-6160,97
+6196,97
@@
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:12
20
+#: builtin/index-pack.c:12
19
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:129
9
+#: builtin/index-pack.c:129
8
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:132
3
+#: builtin/index-pack.c:132
2
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:133
6
+#: builtin/index-pack.c:133
5
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:134
4
+#: builtin/index-pack.c:134
3
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:135
7
+#: builtin/index-pack.c:135
6
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:136
8
+#: builtin/index-pack.c:136
7
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:140
1
+#: builtin/index-pack.c:140
0
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:140
7
+#: builtin/index-pack.c:140
6
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/index-pack.c:141
1 builtin/index-pack.c:1590
+#: builtin/index-pack.c:141
0 builtin/index-pack.c:1589
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:146
9
+#: builtin/index-pack.c:146
8
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:147
1
+#: builtin/index-pack.c:147
0
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:151
8
+#: builtin/index-pack.c:151
7
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:152
5
+#: builtin/index-pack.c:152
4
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:155
4
+#: builtin/index-pack.c:155
3
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:160
2 builtin/index-pack.c:1605
-#: builtin/index-pack.c:161
7 builtin/index-pack.c:1621
+#: builtin/index-pack.c:160
1 builtin/index-pack.c:1604
+#: builtin/index-pack.c:161
6 builtin/index-pack.c:1620
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:163
5
+#: builtin/index-pack.c:163
4
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:163
9 builtin/index-pack.c:1648
+#: builtin/index-pack.c:163
8 builtin/index-pack.c:1647
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:165
6
+#: builtin/index-pack.c:165
5
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@
-6362,10
+6398,10
@@
msgstr " delat"
#: builtin/init-db.c:475
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
#: builtin/init-db.c:475
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [
directory
]"
+"shared[=<permissions>]] [
<directory>
]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
-"shared[=<behörigheter>]] [
katalog
]"
+"shared[=<behörigheter>]] [
<katalog>
]"
#: builtin/init-db.c:498
msgid "permissions"
#: builtin/init-db.c:498
msgid "permissions"
@@
-6428,8
+6464,8
@@
msgid "git log [<options>] [<revision range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
#: builtin/log.c:42
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
#: builtin/log.c:42
-msgid "git show [
options
] <object>..."
-msgstr "git show [
flaggor
] <objekt>..."
+msgid "git show [
<options>
] <object>..."
+msgstr "git show [
<flaggor>
] <objekt>..."
#: builtin/log.c:81
#, c-format
#: builtin/log.c:81
#, c-format
@@
-6507,8
+6543,8
@@
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
#: builtin/log.c:1026
msgstr "tokigt in-reply-to: %s"
#: builtin/log.c:1026
-msgid "git format-patch [
options] [<since> | <revision
range>]"
-msgstr "git format-patch [
flaggor
] [<sedan> | <revisionsintervall>]"
+msgid "git format-patch [
<options>] [<since> | <revision-
range>]"
+msgstr "git format-patch [
<flaggor>
] [<sedan> | <revisionsintervall>]"
#: builtin/log.c:1071
msgid "Two output directories?"
#: builtin/log.c:1071
msgid "Two output directories?"
@@
-6704,95
+6740,95
@@
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/ls-files.c:
401
-msgid "git ls-files [
options
] [<file>...]"
-msgstr "git ls-files [
flaggor
] [<fil>...]"
+#: builtin/ls-files.c:
358
+msgid "git ls-files [
<options>
] [<file>...]"
+msgstr "git ls-files [
<flaggor>
] [<fil>...]"
-#: builtin/ls-files.c:4
58
+#: builtin/ls-files.c:4
15
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:4
60
+#: builtin/ls-files.c:4
17
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:4
62
+#: builtin/ls-files.c:4
19
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:4
64
+#: builtin/ls-files.c:4
21
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:4
66
+#: builtin/ls-files.c:4
23
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:4
68
+#: builtin/ls-files.c:4
25
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:4
70
+#: builtin/ls-files.c:4
27
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:4
73
+#: builtin/ls-files.c:4
30
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:4
75
+#: builtin/ls-files.c:4
32
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:4
77
+#: builtin/ls-files.c:4
34
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:4
80
+#: builtin/ls-files.c:4
37
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:4
83
+#: builtin/ls-files.c:4
40
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:4
85
+#: builtin/ls-files.c:4
42
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:4
87
+#: builtin/ls-files.c:4
44
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:4
90
+#: builtin/ls-files.c:4
47
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:4
93
+#: builtin/ls-files.c:4
50
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:4
95
+#: builtin/ls-files.c:4
52
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:4
98
+#: builtin/ls-files.c:4
55
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:
501
+#: builtin/ls-files.c:
458
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:
502
+#: builtin/ls-files.c:
459
msgid "tree-ish"
msgstr "träd-igt"
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:
503
+#: builtin/ls-files.c:
460
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:
505
+#: builtin/ls-files.c:
462
msgid "show debugging data"
msgstr "visa felsökningsutdata"
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@
-6833,12
+6869,12
@@
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
#: builtin/merge.c:45
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
#: builtin/merge.c:45
-msgid "git merge [
options
] [<commit>...]"
-msgstr "git merge [
flaggor
] [<incheckning>...]"
+msgid "git merge [
<options>
] [<commit>...]"
+msgstr "git merge [
<flaggor>
] [<incheckning>...]"
#: builtin/merge.c:46
#: builtin/merge.c:46
-msgid "git merge [
options
] <msg> HEAD <commit>"
-msgstr "git merge [
flaggor
] <meddelande> HEAD <incheckning>"
+msgid "git merge [
<options>
] <msg> HEAD <commit>"
+msgstr "git merge [
<flaggor>
] <meddelande> HEAD <incheckning>"
#: builtin/merge.c:47
msgid "git merge --abort"
#: builtin/merge.c:47
msgid "git merge --abort"
@@
-7186,12
+7222,12
@@
msgstr ""
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
#: builtin/merge-base.c:29
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
#: builtin/merge-base.c:29
-msgid "git merge-base [-a
|
--all] <commit> <commit>..."
-msgstr "git merge-base [-a
|
--all] <incheckning> <incheckning>..."
+msgid "git merge-base [-a
|
--all] <commit> <commit>..."
+msgstr "git merge-base [-a
|
--all] <incheckning> <incheckning>..."
#: builtin/merge-base.c:30
#: builtin/merge-base.c:30
-msgid "git merge-base [-a
|
--all] --octopus <commit>..."
-msgstr "git merge-base [-a
|
--all] --octopus <incheckning>..."
+msgid "git merge-base [-a
|
--all] --octopus <commit>..."
+msgstr "git merge-base [-a
|
--all] --octopus <incheckning>..."
#: builtin/merge-base.c:31
msgid "git merge-base --independent <commit>..."
#: builtin/merge-base.c:31
msgid "git merge-base --independent <commit>..."
@@
-7227,10
+7263,11
@@
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
#: builtin/merge-file.c:8
msgid ""
#: builtin/merge-file.c:8
msgid ""
-"git merge-file [
options] [-L name1 [-L orig [-L name2]]] file1 orig_file
"
-"
file2
"
+"git merge-file [
<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1>
"
+"
<orig-file> <file2>
"
msgstr ""
msgstr ""
-"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2"
+"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
+"<origfil> <fil2>"
#: builtin/merge-file.c:33
msgid "send results to standard output"
#: builtin/merge-file.c:33
msgid "send results to standard output"
@@
-7261,7
+7298,7
@@
msgid "do not warn about conflicts"
msgstr "varna inte om konflikter"
#: builtin/merge-file.c:45
msgstr "varna inte om konflikter"
#: builtin/merge-file.c:45
-msgid "set labels for file1/orig
_
file/file2"
+msgid "set labels for file1/orig
-
file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
#: builtin/mktree.c:64
msgstr "sätt etiketter för fil1/origfil/fil2"
#: builtin/mktree.c:64
@@
-7281,8
+7318,8
@@
msgid "allow creation of more than one tree"
msgstr "tillåt skapa mer än ett träd"
#: builtin/mv.c:15
msgstr "tillåt skapa mer än ett träd"
#: builtin/mv.c:15
-msgid "git mv [
options
] <source>... <destination>"
-msgstr "git mv [
flaggor
] <källa>... <mål>"
+msgid "git mv [
<options>
] <source>... <destination>"
+msgstr "git mv [
<flaggor>
] <källa>... <mål>"
#: builtin/mv.c:69
#, c-format
#: builtin/mv.c:69
#, c-format
@@
-7368,22
+7405,22
@@
msgstr "%s, källa=%s, mål=%s"
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:35
5
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:35
9
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
#: builtin/name-rev.c:255
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
#: builtin/name-rev.c:255
-msgid "git name-rev [
options
] <commit>..."
-msgstr "git name-rev [
flaggor
] <incheckning>..."
+msgid "git name-rev [
<options>
] <commit>..."
+msgstr "git name-rev [
<flaggor>
] <incheckning>..."
#: builtin/name-rev.c:256
#: builtin/name-rev.c:256
-msgid "git name-rev [
options
] --all"
-msgstr "git name-rev [
flaggor
] --all"
+msgid "git name-rev [
<options>
] --all"
+msgstr "git name-rev [
<flaggor>
] --all"
#: builtin/name-rev.c:257
#: builtin/name-rev.c:257
-msgid "git name-rev [
options
] --stdin"
-msgstr "git name-rev [
flaggor
] --stdin"
+msgid "git name-rev [
<options>
] --stdin"
+msgstr "git name-rev [
<flaggor>
] --stdin"
#: builtin/name-rev.c:309
msgid "print only names (no SHA-1)"
#: builtin/name-rev.c:309
msgid "print only names (no SHA-1)"
@@
-7414,43
+7451,43
@@
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
#: builtin/notes.c:24
msgstr "avreferera taggar i indata (används internt)"
#: builtin/notes.c:24
-msgid "git notes [--ref <notes
_
ref>] [list [<object>]]"
+msgid "git notes [--ref <notes
-
ref>] [list [<object>]]"
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
#: builtin/notes.c:25
msgid ""
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
#: builtin/notes.c:25
msgid ""
-"git notes [--ref <notes
_
ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"git notes [--ref <notes
-
ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
#: builtin/notes.c:26
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
#: builtin/notes.c:26
-msgid "git notes [--ref <notes
_
ref>] copy [-f] <from-object> <to-object>"
+msgid "git notes [--ref <notes
-
ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
#: builtin/notes.c:27
msgid ""
msgstr ""
"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
#: builtin/notes.c:27
msgid ""
-"git notes [--ref <notes
_
ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"git notes [--ref <notes
-
ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
#: builtin/notes.c:28
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
#: builtin/notes.c:28
-msgid "git notes [--ref <notes
_
ref>] edit [--allow-empty] [<object>]"
+msgid "git notes [--ref <notes
-
ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
#: builtin/notes.c:29
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
#: builtin/notes.c:29
-msgid "git notes [--ref <notes
_
ref>] show [<object>]"
+msgid "git notes [--ref <notes
-
ref>] show [<object>]"
msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
#: builtin/notes.c:30
msgid ""
msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
#: builtin/notes.c:30
msgid ""
-"git notes [--ref <notes
_ref>] merge [-v | -q] [-s <strategy> ] <notes_
ref>"
+"git notes [--ref <notes
-ref>] merge [-v | -q] [-s <strategy>] <notes-
ref>"
msgstr ""
msgstr ""
-"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>
] "
+"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
"<anteckningsref>"
#: builtin/notes.c:31
"<anteckningsref>"
#: builtin/notes.c:31
@@
-7462,15
+7499,15
@@
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
#: builtin/notes.c:33
msgstr "git notes merge --abort [-v | -q]"
#: builtin/notes.c:33
-msgid "git notes [--ref <notes
_
ref>] remove [<object>...]"
+msgid "git notes [--ref <notes
-
ref>] remove [<object>...]"
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
#: builtin/notes.c:34
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
#: builtin/notes.c:34
-msgid "git notes [--ref <notes
_
ref>] prune [-n | -v]"
+msgid "git notes [--ref <notes
-
ref>] prune [-n | -v]"
msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"
#: builtin/notes.c:35
msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"
#: builtin/notes.c:35
-msgid "git notes [--ref <notes
_
ref>] get-ref"
+msgid "git notes [--ref <notes
-
ref>] get-ref"
msgstr "git notes [--ref <anteckningsref>] get-ref"
#: builtin/notes.c:40
msgstr "git notes [--ref <anteckningsref>] get-ref"
#: builtin/notes.c:40
@@
-7502,7
+7539,7
@@
msgid "git notes show [<object>]"
msgstr "git notes show [<objekt>]"
#: builtin/notes.c:71
msgstr "git notes show [<objekt>]"
#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes
_
ref>"
+msgid "git notes merge [<options>] <notes
-
ref>"
msgstr "git notes merge [<flaggor>] <anteckningsref>"
#: builtin/notes.c:72
msgstr "git notes merge [<flaggor>] <anteckningsref>"
#: builtin/notes.c:72
@@
-7741,7
+7778,7
@@
msgid "notes-ref"
msgstr "anteckningar-ref"
#: builtin/notes.c:954
msgstr "anteckningar-ref"
#: builtin/notes.c:954
-msgid "use notes from <notes
_
ref>"
+msgid "use notes from <notes
-
ref>"
msgstr "använd anteckningar från <anteckningsref>"
#: builtin/notes.c:989 builtin/remote.c:1621
msgstr "använd anteckningar från <anteckningsref>"
#: builtin/notes.c:989 builtin/remote.c:1621
@@
-7757,186
+7794,186
@@
msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"
-#: builtin/pack-objects.c:17
7 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:17
5 builtin/pack-objects.c:178
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:77
3
+#: builtin/pack-objects.c:77
1
msgid "Writing objects"
msgstr "Skriver objekt"
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:101
5
+#: builtin/pack-objects.c:101
3
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:217
5
+#: builtin/pack-objects.c:217
3
msgid "Compressing objects"
msgstr "Komprimerar objekt"
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:257
2
+#: builtin/pack-objects.c:257
0
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:257
6
+#: builtin/pack-objects.c:257
4
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:259
9
+#: builtin/pack-objects.c:259
7
#, c-format
msgid "option %s does not accept negative form"
msgstr "flaggan %s godtar inte negativ form"
#, c-format
msgid "option %s does not accept negative form"
msgstr "flaggan %s godtar inte negativ form"
-#: builtin/pack-objects.c:260
3
+#: builtin/pack-objects.c:260
1
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
-#: builtin/pack-objects.c:262
3
+#: builtin/pack-objects.c:262
1
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:262
5
+#: builtin/pack-objects.c:262
3
msgid "show progress meter"
msgstr "visa förloppsindikator"
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:262
7
+#: builtin/pack-objects.c:262
5
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:26
30
+#: builtin/pack-objects.c:26
28
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsmätaren visas"
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsmätaren visas"
-#: builtin/pack-objects.c:26
31
+#: builtin/pack-objects.c:26
29
msgid "version[,offset]"
msgstr "version[,offset]"
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:263
2
+#: builtin/pack-objects.c:263
0
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:263
5
+#: builtin/pack-objects.c:263
3
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:263
7
+#: builtin/pack-objects.c:263
5
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:263
9
+#: builtin/pack-objects.c:263
7
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:26
41
+#: builtin/pack-objects.c:26
39
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:264
3
+#: builtin/pack-objects.c:264
1
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:264
5
+#: builtin/pack-objects.c:264
3
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:264
7
+#: builtin/pack-objects.c:264
5
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:264
9
+#: builtin/pack-objects.c:264
7
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:26
51
+#: builtin/pack-objects.c:26
49
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:265
3
+#: builtin/pack-objects.c:265
1
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:265
5
+#: builtin/pack-objects.c:265
3
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:265
7
+#: builtin/pack-objects.c:265
5
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:265
9
+#: builtin/pack-objects.c:265
7
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:266
2
+#: builtin/pack-objects.c:266
0
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:266
5
+#: builtin/pack-objects.c:266
3
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:266
8
+#: builtin/pack-objects.c:266
6
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:26
71
+#: builtin/pack-objects.c:26
69
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:267
3
+#: builtin/pack-objects.c:267
1
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:267
5
+#: builtin/pack-objects.c:267
3
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:267
6
parse-options.h:140
+#: builtin/pack-objects.c:267
4
parse-options.h:140
msgid "time"
msgstr "tid"
msgid "time"
msgstr "tid"
-#: builtin/pack-objects.c:267
7
+#: builtin/pack-objects.c:267
5
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:26
80
+#: builtin/pack-objects.c:26
78
msgid "create thin packs"
msgstr "skapa tunna paket"
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:268
2
+#: builtin/pack-objects.c:268
0
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:268
4
+#: builtin/pack-objects.c:268
2
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:268
6
+#: builtin/pack-objects.c:268
4
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:268
8
+#: builtin/pack-objects.c:268
6
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:26
90
+#: builtin/pack-objects.c:26
88
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:269
2
+#: builtin/pack-objects.c:269
0
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:278
3
+#: builtin/pack-objects.c:278
1
msgid "Counting objects"
msgstr "Räknar objekt"
#: builtin/pack-refs.c:6
msgid "Counting objects"
msgstr "Räknar objekt"
#: builtin/pack-refs.c:6
-msgid "git pack-refs [
options
]"
-msgstr "git pack-refs [
flaggor
]"
+msgid "git pack-refs [
<options>
]"
+msgstr "git pack-refs [
<flaggor>
]"
#: builtin/pack-refs.c:14
msgid "pack everything"
#: builtin/pack-refs.c:14
msgid "pack everything"
@@
-7947,8
+7984,8
@@
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
#: builtin/prune-packed.c:7
msgstr "ta bort lösa referenser (standard)"
#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n
|--dry-run] [-q|
--quiet]"
-msgstr "git prune-packed [-n
|--dry-run] [-q|
--quiet]"
+msgid "git prune-packed [-n
| --dry-run] [-q |
--quiet]"
+msgstr "git prune-packed [-n
| --dry-run] [-q |
--quiet]"
#: builtin/prune-packed.c:40
msgid "Removing duplicate objects"
#: builtin/prune-packed.c:40
msgid "Removing duplicate objects"
@@
-8224,75
+8261,79
@@
msgstr "--mirror kan inte kombineras med referensspecifikationer"
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:
493
+#: builtin/push.c:
502
msgid "repository"
msgstr "arkiv"
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:
494
+#: builtin/push.c:
503
msgid "push all refs"
msgstr "sänd alla referenser"
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:
495
+#: builtin/push.c:
504
msgid "mirror all refs"
msgstr "spegla alla referenser"
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:
497
+#: builtin/push.c:
506
msgid "delete refs"
msgstr "ta bort referenser"
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:
498
+#: builtin/push.c:
507
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:5
01
+#: builtin/push.c:5
10
msgid "force updates"
msgstr "tvinga uppdateringar"
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:5
03
+#: builtin/push.c:5
12
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:5
04
+#: builtin/push.c:5
13
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:5
07
+#: builtin/push.c:5
16
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:5
09
+#: builtin/push.c:5
18
msgid "use thin pack"
msgstr "använd tunna paket"
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:51
0 builtin/push.c:511
+#: builtin/push.c:51
9 builtin/push.c:520
msgid "receive pack program"
msgstr "program för att ta emot paket"
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:5
12
+#: builtin/push.c:5
21
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:5
15
+#: builtin/push.c:5
24
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:5
17
+#: builtin/push.c:5
26
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:5
18
+#: builtin/push.c:5
27
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:52
0
+#: builtin/push.c:52
9
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:529
+#: builtin/push.c:530
+msgid "request atomic transaction on remote side"
+msgstr "begär atomiska transaktioner på fjärrsidan"
+
+#: builtin/push.c:539
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:5
3
1
+#: builtin/push.c:5
4
1
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
@@
-8370,12
+8411,12
@@
msgstr "hoppa över att applicera filter för gles utcheckning"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/reflog.c:4
9
9
+#: builtin/reflog.c:4
2
9
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:
615 builtin/reflog.c:620
+#: builtin/reflog.c:
546 builtin/reflog.c:551
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
@@
-8386,10
+8427,10
@@
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:13
msgid ""
#: builtin/remote.c:13
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags
|
--no-tags] [--"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags
|
--no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <gren>] [-m <master>] [-f] [--tags
|
--no-tags] [--"
+"git remote add [-t <gren>] [-m <master>] [-f] [--tags
|
--no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
#: builtin/remote.c:14 builtin/remote.c:33
"mirror=<fetch|push>] <namn> <url>"
#: builtin/remote.c:14 builtin/remote.c:33
@@
-8400,8
+8441,8
@@
msgstr "git remote rename <gammal> <ny>"
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:16
-msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#: builtin/remote.c:16
builtin/remote.c:43
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |
<branch>)"
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
#: builtin/remote.c:17
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
#: builtin/remote.c:17
@@
-8438,10
+8479,6
@@
msgstr "git remote set-url --delete <namn> <url>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:43
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
-msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
-
#: builtin/remote.c:48
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
#: builtin/remote.c:48
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
@@
-8874,8
+8911,8
@@
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
#: builtin/repack.c:17
msgstr "var pratsam; måste skrivas före ett underkommando"
#: builtin/repack.c:17
-msgid "git repack [
options
]"
-msgstr "git repack [
flaggor
]"
+msgid "git repack [
<options>
]"
+msgstr "git repack [
<flaggor>
]"
#: builtin/repack.c:159
msgid "pack everything in a single pack"
#: builtin/repack.c:159
msgid "pack everything in a single pack"
@@
-8941,7
+8978,7
@@
msgstr "maximal storlek på varje paketfil"
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:37
1
+#: builtin/repack.c:37
5
#, c-format
msgid "removing '%s' failed"
msgstr "misslyckades ta bort \"%s\""
#, c-format
msgid "removing '%s' failed"
msgstr "misslyckades ta bort \"%s\""
@@
-9033,8
+9070,8
@@
msgid "use this format"
msgstr "använd detta format"
#: builtin/rerere.c:12
msgstr "använd detta format"
#: builtin/rerere.c:12
-msgid "git rerere [clear | forget
path
... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget
path
... | status | remaining | diff | gc]"
+msgid "git rerere [clear | forget
<path>
... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget
<path>
... | status | remaining | diff | gc]"
#: builtin/rerere.c:57
msgid "register clean resolutions in index"
#: builtin/rerere.c:57
msgid "register clean resolutions in index"
@@
-9173,8
+9210,8
@@
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
#: builtin/rev-parse.c:361
msgstr "Kunde inte skriva ny indexfil."
#: builtin/rev-parse.c:361
-msgid "git rev-parse --parseopt [
options
] -- [<args>...]"
-msgstr "git rev-parse --parseopt [
options
] -- [<argument>...]"
+msgid "git rev-parse --parseopt [
<options>
] -- [<args>...]"
+msgstr "git rev-parse --parseopt [
<options>
] -- [<argument>...]"
#: builtin/rev-parse.c:366
msgid "keep the `--` passed as an arg"
#: builtin/rev-parse.c:366
msgid "keep the `--` passed as an arg"
@@
-9190,30
+9227,30
@@
msgstr "utdata fast i lång form"
#: builtin/rev-parse.c:499
msgid ""
#: builtin/rev-parse.c:499
msgid ""
-"git rev-parse --parseopt [
options
] -- [<args>...]\n"
+"git rev-parse --parseopt [
<options>
] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [
options
] [<arg>...]\n"
+" or: git rev-parse [
<options>
] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-"git rev-parse --parseopt [
flaggor
] -- [<argument>...]\n"
+"git rev-parse --parseopt [
<flaggor>
] -- [<argument>...]\n"
" eller: git rev-parse --sq-quote [<argument>...]\n"
" eller: git rev-parse --sq-quote [<argument>...]\n"
-" eller: git rev-parse [
flaggor
] [<argument>...]\n"
+" eller: git rev-parse [
<flaggor>
] [<argument>...]\n"
"\n"
"Kör \"git rev-parse --parseopt -h\" för mer information om den första "
"varianten."
#: builtin/revert.c:22
"\n"
"Kör \"git rev-parse --parseopt -h\" för mer information om den första "
"varianten."
#: builtin/revert.c:22
-msgid "git revert [
options
] <commit-ish>..."
-msgstr "git revert [
flaggor
] <incheckning-igt>..."
+msgid "git revert [
<options>
] <commit-ish>..."
+msgstr "git revert [
<flaggor>
] <incheckning-igt>..."
#: builtin/revert.c:23
msgid "git revert <subcommand>"
msgstr "git revert <underkommando>"
#: builtin/revert.c:28
#: builtin/revert.c:23
msgid "git revert <subcommand>"
msgstr "git revert <underkommando>"
#: builtin/revert.c:28
-msgid "git cherry-pick [
options
] <commit-ish>..."
-msgstr "git cherry-pick [
flaggor
] <incheckning-igt>..."
+msgid "git cherry-pick [
<options>
] <commit-ish>..."
+msgstr "git cherry-pick [
<flaggor>
] <incheckning-igt>..."
#: builtin/revert.c:29
msgid "git cherry-pick <subcommand>"
#: builtin/revert.c:29
msgid "git cherry-pick <subcommand>"
@@
-9293,8
+9330,8
@@
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
#: builtin/rm.c:17
msgstr "\"cherry-pick\" misslyckades"
#: builtin/rm.c:17
-msgid "git rm [
options
] [--] <file>..."
-msgstr "git rm [
flaggor
] [--] <fil>..."
+msgid "git rm [
<options>
] [--] <file>..."
+msgstr "git rm [
<flaggor>
] [--] <fil>..."
#: builtin/rm.c:65
msgid ""
#: builtin/rm.c:65
msgid ""
@@
-9394,7
+9431,7
@@
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
#: builtin/shortlog.c:13
msgstr "git rm: kan inte ta bort %s"
#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision
range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision
-
range>] [[--] [<path>...]]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
#: builtin/shortlog.c:131
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
#: builtin/shortlog.c:131
@@
-9424,19
+9461,19
@@
msgstr "Radbryt utdata"
#: builtin/show-branch.c:9
msgid ""
#: builtin/show-branch.c:9
msgid ""
-"git show-branch [-a
|--all] [-r|
--remotes] [--topo-order | --date-order]\n"
+"git show-branch [-a
| --all] [-r |
--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-"git show-branch [-a
|--all] [-r|
--remotes] [--topo-order | --date-order]\n"
+"git show-branch [-a
| --all] [-r |
--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
#: builtin/show-branch.c:13
"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
#: builtin/show-branch.c:13
-msgid "git show-branch (-g
|
--reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g
|
--reflog)[=<n>[,<bas>]] [--list] [<ref>]"
+msgid "git show-branch (-g
|
--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g
|
--reflog)[=<n>[,<bas>]] [--list] [<ref>]"
#: builtin/show-branch.c:652
msgid "show remote-tracking and local branches"
#: builtin/show-branch.c:652
msgid "show remote-tracking and local branches"
@@
-9504,11
+9541,11
@@
msgstr "visa <n> nyaste refloggposter med början på bas"
#: builtin/show-ref.c:10
msgid ""
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q
|--quiet] [--verify] [--head] [-d|--dereference] [-s|
--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [
pattern*]
"
+"git show-ref [-q
| --quiet] [--verify] [--head] [-d | --dereference] [-s |
--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [
<pattern>...]
"
msgstr ""
msgstr ""
-"git show-ref [-q
|--quiet] [--verify] [--head] [-d|--dereference] [-s|
--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [
mönster*]
"
+"git show-ref [-q
| --quiet] [--verify] [--head] [-d | --dereference] [-s |
--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [
<mönster>...]
"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
@@
-9547,12
+9584,12
@@
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
#: builtin/symbolic-ref.c:7
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [
options] name [ref
]"
-msgstr "git symbolic-ref [
flaggor] namn [ref
]"
+msgid "git symbolic-ref [
<options>] <name> [<ref>
]"
+msgstr "git symbolic-ref [
<flaggor>] <namn> [<ref>
]"
#: builtin/symbolic-ref.c:8
#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q]
name
"
-msgstr "git symbolic-ref -d [-q]
namn
"
+msgid "git symbolic-ref -d [-q]
<name>
"
+msgstr "git symbolic-ref -d [-q]
<namn>
"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
@@
-9577,9
+9614,11
@@
msgstr "skäl till uppdateringen"
#: builtin/tag.c:22
msgid ""
#: builtin/tag.c:22
msgid ""
-"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
msgstr ""
-"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]"
+"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "
+"[<huvud>]"
#: builtin/tag.c:23
msgid "git tag -d <tagname>..."
#: builtin/tag.c:23
msgid "git tag -d <tagname>..."
@@
-9587,10
+9626,10
@@
msgstr "git tag -d <taggnamn>..."
#: builtin/tag.c:24
msgid ""
#: builtin/tag.c:24
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]
\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
"\t\t[<pattern>...]"
msgstr ""
"\t\t[<pattern>...]"
msgstr ""
-"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]
\n"
+"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"
"\t\t[<mönster>...]"
#: builtin/tag.c:26
"\t\t[<mönster>...]"
#: builtin/tag.c:26
@@
-9734,18
+9773,18
@@
msgstr "använd annan nyckel för att signera taggen"
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:608
+#: builtin/tag.c:609
+msgid "Tag listing options"
+msgstr "Alternativ för listning av taggar"
+
+#: builtin/tag.c:610
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:61
0
+#: builtin/tag.c:61
2
msgid "sort tags"
msgstr "sortera taggar"
msgid "sort tags"
msgstr "sortera taggar"
-#: builtin/tag.c:614
-msgid "Tag listing options"
-msgstr "Alternativ för listning av taggar"
-
#: builtin/tag.c:617 builtin/tag.c:623
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
#: builtin/tag.c:617 builtin/tag.c:623
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
@@
-9802,8
+9841,8
@@
msgid "Unpacking objects"
msgstr "Packar upp objekt"
#: builtin/update-index.c:403
msgstr "Packar upp objekt"
#: builtin/update-index.c:403
-msgid "git update-index [
options
] [--] [<file>...]"
-msgstr "git update-index [
flaggor
] [--] [<fil>...]"
+msgid "git update-index [
<options>
] [--] [<file>...]"
+msgstr "git update-index [
<flaggor>
] [--] [<fil>...]"
#: builtin/update-index.c:756
msgid "continue refresh even when index needs update"
#: builtin/update-index.c:756
msgid "continue refresh even when index needs update"
@@
-9918,16
+9957,16
@@
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
#: builtin/update-ref.c:9
msgstr "aktivera eller inaktivera delat index"
#: builtin/update-ref.c:9
-msgid "git update-ref [
options] -d <refname> [<old
val>]"
-msgstr "git update-ref [
flaggor
] -d <refnamn> [<gammaltvärde>]"
+msgid "git update-ref [
<options>] -d <refname> [<old-
val>]"
+msgstr "git update-ref [
<flaggor>
] -d <refnamn> [<gammaltvärde>]"
#: builtin/update-ref.c:10
#: builtin/update-ref.c:10
-msgid "git update-ref [
options] <refname> <newval> [<old
val>]"
-msgstr "git update-ref [
flaggor
] <refnamn> <gammaltvärde> [<nyttvärde>]"
+msgid "git update-ref [
<options>] <refname> <new-val> [<old-
val>]"
+msgstr "git update-ref [
<flaggor>
] <refnamn> <gammaltvärde> [<nyttvärde>]"
#: builtin/update-ref.c:11
#: builtin/update-ref.c:11
-msgid "git update-ref [
options
] --stdin [-z]"
-msgstr "git update-ref [
flaggor
] --stdin [-z]"
+msgid "git update-ref [
<options>
] --stdin [-z]"
+msgstr "git update-ref [
<flaggor>
] --stdin [-z]"
#: builtin/update-ref.c:359
msgid "delete the reference"
#: builtin/update-ref.c:359
msgid "delete the reference"
@@
-9954,16
+9993,16
@@
msgid "update the info files from scratch"
msgstr "uppdatera informationsfilerna från grunden"
#: builtin/verify-commit.c:17
msgstr "uppdatera informationsfilerna från grunden"
#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v
|
--verbose] <commit>..."
-msgstr "git verify-commit [-v
|
--verbose] <incheckning>..."
+msgid "git verify-commit [-v
|
--verbose] <commit>..."
+msgstr "git verify-commit [-v
|
--verbose] <incheckning>..."
#: builtin/verify-commit.c:75
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
#: builtin/verify-pack.c:54
#: builtin/verify-commit.c:75
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v
|--verbose] [-s|
--stat-only] <pack>..."
-msgstr "git verify-pack [-v
|--verbose] [-s|
--stat-only] <paket>..."
+msgid "git verify-pack [-v
| --verbose] [-s |
--stat-only] <pack>..."
+msgstr "git verify-pack [-v
| --verbose] [-s |
--stat-only] <paket>..."
#: builtin/verify-pack.c:64
msgid "verbose"
#: builtin/verify-pack.c:64
msgid "verbose"
@@
-9974,8
+10013,8
@@
msgid "show statistics only"
msgstr "visa endast statistik"
#: builtin/verify-tag.c:17
msgstr "visa endast statistik"
#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v
|
--verbose] <tag>..."
-msgstr "git verify-tag [-v
|
--verbose] <tagg>..."
+msgid "git verify-tag [-v
|
--verbose] <tag>..."
+msgstr "git verify-tag [-v
|
--verbose] <tagg>..."
#: builtin/verify-tag.c:73
msgid "print tag contents"
#: builtin/verify-tag.c:73
msgid "print tag contents"
@@
-10325,10
+10364,10
@@
msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
#: git-bisect.sh:130
#, sh-format
msgid ""
#: git-bisect.sh:130
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+"Checking out '$start_head' failed. Try 'git bisect reset <valid
-
branch>'."
msgstr ""
"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
msgstr ""
"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
-"<giltiggren>\""
+"<giltig
_
gren>\""
# cogito-relaterat
#: git-bisect.sh:140
# cogito-relaterat
#: git-bisect.sh:140
@@
-11083,6
+11122,18
@@
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#~ msgid "(detached from %s)"
+#~ msgstr "(frånkopplad från %s)"
+
+#~ msgid "No existing author found with '%s'"
+#~ msgstr "Hittade ingen befintlig författare med \"%s\""
+
+#~ msgid "search also in ignored files"
+#~ msgstr "sök även i ignorerade filer"
+
+#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
+
#~ msgid "no files added"
#~ msgstr "inga filer har lagts till"
#~ msgid "no files added"
#~ msgstr "inga filer har lagts till"