aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorPeter Krefting <peter@softwolves.pp.se>2013-02-19 10:26:36 +0100
committerPeter Krefting <peter@softwolves.pp.se>2013-02-19 10:26:36 +0100
commit2afd3ef7286124d5ffb5029020633e38d213bfd5 (patch)
treecb996e34aed833b4b7aa6095cbe8521edc8fc4ee /po
parent1415174ad584aa658cafa3e4e1d5780e4fffa0ee (diff)
downloadgit-2afd3ef7286124d5ffb5029020633e38d213bfd5.tar.gz
git-2afd3ef7286124d5ffb5029020633e38d213bfd5.tar.xz
l10n: Update Swedish translation (2009t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
-rw-r--r--po/sv.po231
1 files changed, 130 insertions, 101 deletions
diff --git a/po/sv.po b/po/sv.po
index 1110ca718..9ac06c970 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 1.8.2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-02-14 14:46+0800\n"
-"PO-Revision-Date: 2013-02-18 23:00+0100\n"
+"POT-Creation-Date: 2013-02-19 13:32+0800\n"
+"PO-Revision-Date: 2013-02-19 10:25+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -306,22 +306,22 @@ msgid_plural "%lu years ago"
msgstr[0] "%lu år sedan"
msgstr[1] "%lu år sedan"
-#: diff.c:111
+#: diff.c:112
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:116
+#: diff.c:117
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:194
+#: diff.c:210
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:237
+#: diff.c:260
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -330,7 +330,7 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3494
+#: diff.c:3468
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -339,7 +339,7 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3508
+#: diff.c:3482
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
@@ -703,27 +703,31 @@ msgstr "Kunde inte tolka objektet \"%s\""
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
-#: parse-options.c:485
+#: parse-options.c:489
msgid "..."
msgstr "..."
-#: parse-options.c:503
+#: parse-options.c:507
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:507
+#: parse-options.c:511
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:510
+#: parse-options.c:514
#, c-format
msgid " %s"
msgstr " %s"
+#: parse-options.c:548
+msgid "-NUM"
+msgstr "-TAL"
+
#: pathspec.c:83
#, c-format
msgid "Path '%s' is in submodule '%.*s'"
@@ -983,7 +987,7 @@ msgstr "kan inte bestämma HEAD"
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:821 builtin/apply.c:4020
+#: sequencer.c:821 builtin/apply.c:4056
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
@@ -1207,7 +1211,7 @@ msgstr "programfel: diff-status %c ej hanterad"
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:792 wt-status.c:916
+#: wt-status.c:792 wt-status.c:944
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
@@ -1239,112 +1243,137 @@ msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
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:877 wt-status.c:887
+#: wt-status.c:879 wt-status.c:896
+#, 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:884 wt-status.c:901
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:880
+#: wt-status.c:887
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:882
+#: wt-status.c:889
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:884
+#: wt-status.c:891
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:890
+#: wt-status.c:904
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:892
+#: wt-status.c:908
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
+"ovanpå \"%s\"."
+
+#: wt-status.c:913
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:895
+#: wt-status.c:916
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:897
+#: wt-status.c:920
+#, 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:925
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:900
+#: wt-status.c:928
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:902
+#: wt-status.c:930
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:912
+#: wt-status.c:940
msgid "You are currently cherry-picking."
msgstr "Du håller på med en \"cherry-pick\"."
-#: wt-status.c:919
+#: wt-status.c:947
msgid " (all conflicts fixed: run \"git commit\")"
msgstr " (alla konflikter har rättats: kör \"git commit\")"
-#: wt-status.c:928
+#: wt-status.c:958
+#, c-format
+msgid "You are currently bisecting branch '%s'."
+msgstr "Du håller på med en \"bisect\" på grenen \"%s\"."
+
+#: wt-status.c:962
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:931
+#: wt-status.c:965
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:982
+#: wt-status.c:1064
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:989
+#: wt-status.c:1071
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1001
+#: wt-status.c:1083
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1015
+#: wt-status.c:1097
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1017
+#: wt-status.c:1099
msgid "Ignored files"
msgstr "Ignorerade filer"
# %s är nästa sträng eller tom.
-#: wt-status.c:1019
+#: wt-status.c:1101
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1021
+#: wt-status.c:1103
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1027
+#: wt-status.c:1109
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1032
+#: wt-status.c:1114
#, 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:1035
+#: wt-status.c:1117
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1038
+#: wt-status.c:1120
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -1353,48 +1382,48 @@ msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1041
+#: wt-status.c:1123
#, 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:1044
+#: wt-status.c:1126
#, 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:1047 wt-status.c:1052
+#: wt-status.c:1129 wt-status.c:1134
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1050
+#: wt-status.c:1132
#, 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:1054
+#: wt-status.c:1136
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1162
+#: wt-status.c:1244
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1168
+#: wt-status.c:1250
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1183
+#: wt-status.c:1265
msgid "behind "
msgstr "efter "
-#: wt-status.c:1186 wt-status.c:1189
+#: wt-status.c:1268 wt-status.c:1271
msgid "ahead "
msgstr "före "
-#: wt-status.c:1191
+#: wt-status.c:1273
msgid ", behind "
msgstr ", efter "
@@ -1467,7 +1496,7 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19
+#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
@@ -1593,7 +1622,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370
+#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
@@ -1846,224 +1875,224 @@ msgstr "%s: patchen kan inte tillämpas"
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124
+#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:3782
+#: builtin/apply.c:3818
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:3810
+#: builtin/apply.c:3846
#, c-format
msgid "corrupt patch for subproject %s"
msgstr "trasig patch för underprojektet %s"
-#: builtin/apply.c:3814
+#: builtin/apply.c:3850
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:3819
+#: builtin/apply.c:3855
#, 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:3822 builtin/apply.c:3930
+#: builtin/apply.c:3858 builtin/apply.c:3966
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:3855
+#: builtin/apply.c:3891
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:3904
+#: builtin/apply.c:3940
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:3991
+#: builtin/apply.c:4027
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:3999
+#: builtin/apply.c:4035
msgid "internal error"
msgstr "internt fel"
#. Say this even without --verbose
-#: builtin/apply.c:4002
+#: builtin/apply.c:4038
#, 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:4012
+#: builtin/apply.c:4048
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4033
+#: builtin/apply.c:4069
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4036
+#: builtin/apply.c:4072
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4186
+#: builtin/apply.c:4222
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4197
+#: builtin/apply.c:4233
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91
+#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
#: builtin/fetch.c:63
msgid "path"
msgstr "sökväg"
-#: builtin/apply.c:4317
+#: builtin/apply.c:4353
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4320
+#: builtin/apply.c:4356
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4322
+#: builtin/apply.c:4358
msgid "num"
msgstr "antal"
-#: builtin/apply.c:4323
+#: builtin/apply.c:4359
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:4326
+#: builtin/apply.c:4362
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4328
+#: builtin/apply.c:4364
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:4332
+#: builtin/apply.c:4368
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4334
+#: builtin/apply.c:4370
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:4336
+#: builtin/apply.c:4372
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:4338
+#: builtin/apply.c:4374
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:4340
+#: builtin/apply.c:4376
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4342
+#: builtin/apply.c:4378
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4344
+#: builtin/apply.c:4380
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:4346
+#: builtin/apply.c:4382
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463
+#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/apply.c:4351
+#: builtin/apply.c:4387
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: builtin/apply.c:4352
+#: builtin/apply.c:4388
msgid "action"
msgstr "åtgärd"
-#: builtin/apply.c:4353
+#: builtin/apply.c:4389
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4356 builtin/apply.c:4359
+#: builtin/apply.c:4392 builtin/apply.c:4395
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4362
+#: builtin/apply.c:4398
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4364
+#: builtin/apply.c:4400
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4366
+#: builtin/apply.c:4402
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4368
+#: builtin/apply.c:4404
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4371
+#: builtin/apply.c:4407
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4374
+#: builtin/apply.c:4410
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: builtin/apply.c:4376
+#: builtin/apply.c:4412
msgid "root"
msgstr "rot"
-#: builtin/apply.c:4377
+#: builtin/apply.c:4413
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4399
+#: builtin/apply.c:4435
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: builtin/apply.c:4407
+#: builtin/apply.c:4443
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: builtin/apply.c:4410
+#: builtin/apply.c:4446
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: builtin/apply.c:4426
+#: builtin/apply.c:4462
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
-#: builtin/apply.c:4440
+#: builtin/apply.c:4476
#, 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:4446 builtin/apply.c:4456
+#: builtin/apply.c:4482 builtin/apply.c:4492
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."