kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge remote-tracking branch 'sv/nafmo/master' 

* sv/nafmo/master:
  l10n: Fix more typos in the Swedish translations
maint
Jiang Xin 11 years ago
parent
fe05e196c5 7cefd3431a
commit
6d0081ad61
1 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      po/sv.po

38
po/sv.po
Unescape View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: git 2.0.0\n" "Project-Id-Version: git 2.0.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: 2014-04-19 12:50+0800\n" "POT-Creation-Date: 2014-04-19 12:50+0800\n"
"PO-Revision-Date: 2014-05-07 07:04+0100\n" "PO-Revision-Date: 2014-06-24 19:51+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n" "Language: sv\n"
@ -577,7 +577,7 @@ msgstr "%s: %s - %s"


#: merge.c:56 #: merge.c:56
msgid "failed to read the cache" msgid "failed to read the cache"
msgstr "misslyckads läsa cachen" msgstr "misslyckades läsa cachen"


#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 #: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
#: builtin/clone.c:661 #: builtin/clone.c:661
@ -723,7 +723,7 @@ msgstr "Lägger till sammanslagen %s"
#: merge-recursive.c:1465 merge-recursive.c:1663 #: merge-recursive.c:1465 merge-recursive.c:1663
#, c-format #, c-format
msgid "Adding as %s instead" msgid "Adding as %s instead"
msgstr "Lägger till som %s iställer" msgstr "Lägger till som %s istället"


#: merge-recursive.c:1516 #: merge-recursive.c:1516
#, c-format #, c-format
@ -1414,7 +1414,7 @@ msgstr "felaktigt portnummer"


#: urlmatch.c:322 #: urlmatch.c:322
msgid "invalid '..' path segment" msgid "invalid '..' path segment"
msgstr "felaktit \"..\"-sökvägssegment" msgstr "felaktigt \"..\"-sökvägssegment"


#: wrapper.c:422 #: wrapper.c:422
#, c-format #, c-format
@ -4395,7 +4395,7 @@ msgstr "datum"


#: builtin/commit.c:1492 #: builtin/commit.c:1492
msgid "override date for commit" msgid "override date for commit"
msgstr "överstyr datum för inchecknignen" msgstr "överstyr datum för incheckningen"


#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409 #: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
#: builtin/notes.c:566 builtin/tag.c:510 #: builtin/notes.c:566 builtin/tag.c:510
@ -4588,7 +4588,7 @@ msgstr "använd arkivets konfigurationsfil"


#: builtin/config.c:57 #: builtin/config.c:57
msgid "use given config file" msgid "use given config file"
msgstr "använd angiven konfigurationsil" msgstr "använd angiven konfigurationsfil"


#: builtin/config.c:58 #: builtin/config.c:58
msgid "blob-id" msgid "blob-id"
@ -5395,7 +5395,7 @@ msgstr "sök i indexet istället för i arbetskatalogen"


#: builtin/grep.c:642 #: builtin/grep.c:642
msgid "find in contents not managed by git" msgid "find in contents not managed by git"
msgstr "sök i innehål som inte hanteras av git" msgstr "sök i innehåll som inte hanteras av git"


#: builtin/grep.c:644 #: builtin/grep.c:644
msgid "search in both tracked and untracked files" msgid "search in both tracked and untracked files"
@ -5979,7 +5979,7 @@ msgstr "Kan inte öppna befintlig paketfil \"%s\""
#: builtin/index-pack.c:1428 #: builtin/index-pack.c:1428
#, c-format #, c-format
msgid "Cannot open existing pack idx file for '%s'" msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\"" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""


#: builtin/index-pack.c:1475 #: builtin/index-pack.c:1475
#, c-format #, c-format
@ -6262,7 +6262,7 @@ msgstr "använd [PATCH] även för flera patchar"


#: builtin/log.c:1182 #: builtin/log.c:1182
msgid "print patches to standard out" msgid "print patches to standard out"
msgstr "skriv patcharna på stnadard ut" msgstr "skriv patcharna på standard ut"


#: builtin/log.c:1184 #: builtin/log.c:1184
msgid "generate a cover letter" msgid "generate a cover letter"
@ -6639,7 +6639,7 @@ msgstr "strategi"


#: builtin/merge.c:213 #: builtin/merge.c:213
msgid "merge strategy to use" msgid "merge strategy to use"
msgstr "sammanslagninsstrategi att använda" msgstr "sammanslagningsstrategi att använda"


#: builtin/merge.c:214 #: builtin/merge.c:214
msgid "option=value" msgid "option=value"
@ -6891,7 +6891,7 @@ msgstr "Återspolar trädet till orört...\n"
#: builtin/merge.c:1471 #: builtin/merge.c:1471
#, c-format #, c-format
msgid "Trying merge strategy %s...\n" msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagninsstrategin %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n"


#: builtin/merge.c:1537 #: builtin/merge.c:1537
#, c-format #, c-format
@ -7807,7 +7807,7 @@ msgstr ""
"\n" "\n"
" git config --global push.default simple\n" " git config --global push.default simple\n"
"\n" "\n"
"Nör push.default är satt till \"matching\" kommer git att sända lokala " "När push.default är satt till \"matching\" kommer git att sända lokala "
"grenar\n" "grenar\n"
"till fjärrgrenar som redan finns och som har samma namn.\n" "till fjärrgrenar som redan finns och som har samma namn.\n"
"\n" "\n"
@ -8002,7 +8002,7 @@ msgstr "sänd in saknade men relevanta taggar"


#: builtin/push.c:518 #: builtin/push.c:518
msgid "--delete is incompatible with --all, --mirror and --tags" msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är imkompatibel med --all, --mirror och --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags"


#: builtin/push.c:520 #: builtin/push.c:520
msgid "--delete doesn't make sense without any refs" msgid "--delete doesn't make sense without any refs"
@ -8909,7 +8909,7 @@ msgstr "nummer på förälder"


#: builtin/revert.c:89 #: builtin/revert.c:89
msgid "merge strategy" msgid "merge strategy"
msgstr "sammanslagninsstrategi" msgstr "sammanslagningsstrategi"


#: builtin/revert.c:90 #: builtin/revert.c:90
msgid "option" msgid "option"
@ -9126,7 +9126,7 @@ msgstr "namnge incheckningar med deras objektnamn"


#: builtin/show-branch.c:664 #: builtin/show-branch.c:664
msgid "show possible merge bases" msgid "show possible merge bases"
msgstr "visa möjliga sammanslaningsbaser" msgstr "visa möjliga sammanslagningsbaser"


#: builtin/show-branch.c:666 #: builtin/show-branch.c:666
msgid "show refs unreachable from any other ref" msgid "show refs unreachable from any other ref"
@ -9327,7 +9327,7 @@ msgstr "Taggmeddelandet har lämnats i %s\n"


#: builtin/tag.c:455 #: builtin/tag.c:455
msgid "switch 'points-at' requires an object" msgid "switch 'points-at' requires an object"
msgstr "flaggan \"points-at\" behöver ett object" msgstr "flaggan \"points-at\" behöver ett objekt"


#: builtin/tag.c:457 #: builtin/tag.c:457
#, c-format #, c-format
@ -9558,7 +9558,7 @@ msgstr "ignorera filer som saknas i arbetskatalogen"


#: builtin/update-index.c:818 #: builtin/update-index.c:818
msgid "report actions to standard output" msgid "report actions to standard output"
msgstr "raportera åtgärder på standard ut" msgstr "rapportera åtgärder på standard ut"


#: builtin/update-index.c:820 #: builtin/update-index.c:820
msgid "(for porcelains) forget saved unresolved conflicts" msgid "(for porcelains) forget saved unresolved conflicts"
@ -9806,7 +9806,7 @@ msgstr ""


#: git-am.sh:181 #: git-am.sh:181
msgid "Failed to merge in the changes." msgid "Failed to merge in the changes."
msgstr "Misslyckads slå ihop ändringarna." msgstr "Misslyckades slå ihop ändringarna."


#: git-am.sh:276 #: git-am.sh:276
msgid "Only one StGIT patch series can be applied at once" msgid "Only one StGIT patch series can be applied at once"
@ -10433,7 +10433,7 @@ msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt"


#: git-submodule.sh:409 #: git-submodule.sh:409
msgid "Relative path can only be used from the toplevel of the working tree" msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan enfast användas från arbetskatalogens toppnivå" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"


#: git-submodule.sh:419 #: git-submodule.sh:419
#, sh-format #, sh-format

Write Preview
Loading…
Cancel
Save