* [PATCH 2/2] Add Swedish translation.
@ 2010-09-12 20:10 Peter Krefting
2010-09-12 23:03 ` Ævar Arnfjörð Bjarmason
2010-09-13 10:12 ` Peter Kjellerstedt
0 siblings, 2 replies; 24+ messages in thread
From: Peter Krefting @ 2010-09-12 20:10 UTC (permalink / raw)
To: git, avarab
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
---
po/sv.po | 2947 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 2947 insertions(+), 0 deletions(-)
create mode 100644 po/sv.po
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..26fa0a6
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,2947 @@
+# Swedish translation of git
+# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
+# Peter Krefting <peter@softwolves.pp.se>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: git 1.7.3\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2010-09-10 20:09+0100\n"
+"PO-Revision-Date: 2010-09-12 21:07+0100\n"
+"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
+
+#: wt-status.c:56
+msgid "# Unmerged paths:"
+msgstr "# Ej sammanslagna sökvägar:"
+
+#: wt-status.c:62 wt-status.c:79
+#, c-format
+msgid "# (use \"git reset %s <file>...\" to unstage)"
+msgstr "# (använd \"git reset %s <fil>...\" för att ta bort från kö)"
+
+#: wt-status.c:64 wt-status.c:81
+msgid "# (use \"git rm --cached <file>...\" to unstage)"
+msgstr "# (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
+
+#: wt-status.c:65
+msgid "# (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "# (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
+
+#: wt-status.c:73
+msgid "# Changes to be committed:"
+msgstr "# Ändringar att checka in:"
+
+#: wt-status.c:91
+msgid "# Changed but not updated:"
+msgstr "# Ändrade men inte uppdaterade:"
+
+#: wt-status.c:95
+msgid "# (use \"git add <file>...\" to update what will be committed)"
+msgstr "# (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
+
+#: wt-status.c:97
+msgid "# (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "# (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
+
+#: wt-status.c:98
+msgid ""
+"# (use \"git checkout -- <file>...\" to discard changes in working "
+"directory)"
+msgstr ""
+"# (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
+"arbetskatalogen)"
+
+#: wt-status.c:100
+msgid "# (commit or discard the untracked or modified content in submodules)"
+msgstr "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
+
+#: wt-status.c:109
+#, c-format
+msgid "# %s files:"
+msgstr "# %s filer:"
+
+#: wt-status.c:112
+#, c-format
+msgid "# (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "# (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"
+
+#: wt-status.c:129
+msgid "bug"
+msgstr "programfel"
+
+#: wt-status.c:134
+msgid "both deleted:"
+msgstr "borttaget av bägge:"
+
+#: wt-status.c:135
+msgid "added by us:"
+msgstr "tillagt av oss:"
+
+#: wt-status.c:136
+msgid "deleted by them:"
+msgstr "borttaget av dem:"
+
+#: wt-status.c:137
+msgid "added by them:"
+msgstr "tillagt av dem:"
+
+#: wt-status.c:138
+msgid "deleted by us:"
+msgstr "borttaget av oss:"
+
+#: wt-status.c:139
+msgid "both added:"
+msgstr "tillagt av bägge:"
+
+#: wt-status.c:140
+msgid "both modified:"
+msgstr "ändrat av bägge:"
+
+#: wt-status.c:170
+msgid "new commits, "
+msgstr "nya incheckningar, "
+
+#: wt-status.c:172
+msgid "modified content, "
+msgstr "ändrat innehåll, "
+
+#: wt-status.c:174
+msgid "untracked content, "
+msgstr "ospårat innehåll, "
+
+#: wt-status.c:188
+#, c-format
+msgid "new file: %s"
+msgstr "ny fil: %s"
+
+#: wt-status.c:191
+#, c-format
+msgid "copied: %s -> %s"
+msgstr "kopierad: %s -> %s"
+
+#: wt-status.c:194
+#, c-format
+msgid "deleted: %s"
+msgstr "borttagen: %s"
+
+#: wt-status.c:197
+#, c-format
+msgid "modified: %s"
+msgstr "ändrad: %s"
+
+#: wt-status.c:200
+#, c-format
+msgid "renamed: %s -> %s"
+msgstr "namnbyte: %s -> %s"
+
+#: wt-status.c:203
+#, c-format
+msgid "typechange: %s"
+msgstr "typbyte: %s"
+
+#: wt-status.c:206
+#, c-format
+msgid "unknown: %s"
+msgstr "okänd: %s"
+
+#: wt-status.c:209
+#, c-format
+msgid "unmerged: %s"
+msgstr "osammansl.: %s"
+
+#: wt-status.c:212
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr "programfel: diff-status %c ej hanterad"
+
+#: wt-status.c:635
+msgid "On branch "
+msgstr "På grenen "
+
+#: wt-status.c:642
+msgid "Not currently on any branch."
+msgstr "Inte på någon gren för närvarande."
+
+#: wt-status.c:652
+msgid "# Initial commit"
+msgstr "# Grundincheckning"
+
+#: wt-status.c:666
+msgid "Untracked"
+msgstr "Ospårad"
+
+#: wt-status.c:666 builtin/notes.c:562
+msgid "add"
+msgstr "add"
+
+#: wt-status.c:668
+msgid "Ignored"
+msgstr "Ignorerad"
+
+#: wt-status.c:668
+msgid "add -f"
+msgstr "add -f"
+
+#: wt-status.c:670
+#, c-format
+msgid "# Untracked files not listed%s\n"
+msgstr "# Ospårade filer visas ej%s\n"
+
+#: wt-status.c:672
+msgid " (use -u option to show untracked files)"
+msgstr " (använd flaggan -u för att visa ospårade filer)"
+
+#: wt-status.c:678
+#, c-format
+msgid "# No changes\n"
+msgstr "# Inga ändringar\n"
+
+#: wt-status.c:682
+#, c-format
+msgid "no changes added to commit%s\n"
+msgstr "inga ändringar att checka in%s\n"
+
+#: wt-status.c:684
+msgid " (use \"git add\" and/or \"git commit -a\")"
+msgstr " (använd \"git add\" och/eller \"git commit -a\")"
+
+#: wt-status.c:686
+#, c-format
+msgid "nothing added to commit but untracked files present%s\n"
+msgstr "inget köat för incheckning, men ospårade filer finns%s\n"
+
+#: wt-status.c:688
+msgid " (use \"git add\" to track)"
+msgstr " (använd \"git add\" för att spåra)"
+
+#: wt-status.c:691
+msgid " (create/copy files and use \"git add\" to track)"
+msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"
+
+#: wt-status.c:693 wt-status.c:696
+#, c-format
+msgid "nothing to commit%s\n"
+msgstr "inget att checka in%s\n"
+
+#: wt-status.c:694
+msgid " (use -u to show untracked files)"
+msgstr " (använd -u för att visa ospårade filer)"
+
+#: wt-status.c:697
+msgid " (working directory clean)"
+msgstr " (arbetskatalogen ren)"
+
+#: wt-status.c:795
+msgid "HEAD (no branch)"
+msgstr "HEAD (ingen gren)"
+
+#: wt-status.c:801
+msgid "Initial commit on "
+msgstr "Grundincheckning på "
+
+#: wt-status.c:816
+msgid "behind "
+msgstr "efter "
+
+#: wt-status.c:819 wt-status.c:822
+msgid "ahead "
+msgstr "före "
+
+#: wt-status.c:824
+msgid ", behind "
+msgstr ", efter "
+
+#: builtin/add.c:41
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "diff-status %c förväntades inte"
+
+#: builtin/add.c:67 builtin/commit.c:244
+msgid "updating files failed"
+msgstr "misslyckades uppdatera filer"
+
+#: builtin/add.c:77
+#, c-format
+msgid "remove '%s'\n"
+msgstr "ta bort \"%s\"\n"
+
+#: builtin/add.c:175
+#, c-format
+msgid "Path '%s' is in submodule '%.*s'"
+msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
+
+#: builtin/add.c:191
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
+
+#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
+
+#: builtin/add.c:208
+#, c-format
+msgid "'%s' is beyond a symbolic link"
+msgstr "\"%s\" är på andra sidan av en symbolisk länk"
+
+#: builtin/add.c:275
+msgid "Could not read the index"
+msgstr "Kunde inte läsa indexet"
+
+#: builtin/add.c:284
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Kunde inte öppna \"%s\" för skrivning"
+
+#: builtin/add.c:288
+msgid "Could not write patch"
+msgstr "Kunde inte skriva patch"
+
+#: builtin/add.c:293
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Kunde inte ta status på \"%s\""
+
+#: builtin/add.c:295
+msgid "Empty patch. Aborted."
+msgstr "Tom patch. Avbryter."
+
+#: builtin/add.c:301
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Kunde inte applicera \"%s\""
+
+#: builtin/add.c:349
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+
+#: builtin/add.c:350
+msgid "no files added"
+msgstr "inga filer har lagts till"
+
+#: builtin/add.c:356
+msgid "adding files failed"
+msgstr "misslyckades lägga till filer"
+
+#: builtin/add.c:388
+msgid "-A and -u are mutually incompatible"
+msgstr "-A och -u är ömsesidigt inkompatibla"
+
+#: builtin/add.c:390
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+
+#: builtin/add.c:410
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Inget angivet, inget tillagt.\n"
+
+#: builtin/add.c:411
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Kanske menade du att skriva \"git add .\"?\n"
+
+#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301
+#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171
+msgid "index file corrupt"
+msgstr "indexfilen trasig"
+
+#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268
+msgid "Unable to write new index file"
+msgstr "Kunde inte skriva ny indexfil"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "Kunde inte skapa arkivfilen \"%s\""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "kunde inte omdirigera utdata"
+
+#: builtin/archive.c:36
+msgid "git archive: Remote with no URL"
+msgstr "git archive: Fjärr utan URL"
+
+#: builtin/archive.c:46
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr "git archive: förväntade ACK/NAK, fick EOF"
+
+#: builtin/archive.c:51
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:52
+msgid "git archive: protocol error"
+msgstr "git archive: protokollfel"
+
+#: builtin/archive.c:57
+msgid "git archive: expected a flush"
+msgstr "git archive: förväntade en tömning (flush)"
+
+#: builtin/branch.c:136
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but it is not yet merged to HEAD."
+msgstr ""
+"tar bort grenen \"%s\" som inte har slagits ihop med\n"
+" \"%s\", men som ännu inte slagits ihop med HEAD."
+
+#: builtin/branch.c:140
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
+" \"%s\", trots att den har slagits ihop med HEAD."
+
+#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
+#: builtin/branch.c:161
+msgid "remote "
+msgstr "fjärr"
+
+#: builtin/branch.c:169
+msgid "cannot use -a with -d"
+msgstr "kan inte ange -a med -d"
+
+#: builtin/branch.c:175
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
+
+#: builtin/branch.c:180
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
+
+#: builtin/branch.c:190
+#, c-format
+msgid "%sbranch '%s' not found."
+msgstr "%sgrenen \"%s\" hittades inte."
+
+#: builtin/branch.c:198
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
+
+#: builtin/branch.c:204
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
+"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
+
+#: builtin/branch.c:212
+#, c-format
+msgid "Error deleting %sbranch '%s'"
+msgstr "Fel vid borttagning av %sgrenen \"%s\""
+
+#: builtin/branch.c:217
+#, c-format
+msgid "Deleted %sbranch %s (was %s).\n"
+msgstr "Tog bort %sgrenen %s (var %s).\n"
+
+#: builtin/branch.c:222
+msgid "Update of config-file failed"
+msgstr "Misslyckades uppdatera konfigurationsfil"
+
+#: builtin/branch.c:304
+#, c-format
+msgid "branch '%s' does not point at a commit"
+msgstr "grenen \"%s\" pekar inte på en incheckning"
+
+#: builtin/branch.c:381
+#, c-format
+msgid "behind %d] "
+msgstr "bakom %d] "
+
+#: builtin/branch.c:383
+#, c-format
+msgid "ahead %d] "
+msgstr "före %d] "
+
+#: builtin/branch.c:385
+#, c-format
+msgid "ahead %d, behind %d] "
+msgstr "före %d, bakom %d] "
+
+#: builtin/branch.c:484
+msgid "(no branch)"
+msgstr "(ingen gren)"
+
+#: builtin/branch.c:544
+msgid "some refs could not be read"
+msgstr "vissa referenser kunde inte läsas"
+
+#: builtin/branch.c:557
+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:567 builtin/branch.c:571
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Felaktigt namn på gren: \"%s\""
+
+#: builtin/branch.c:574
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Det finns redan en gren som heter \"%s\""
+
+#: builtin/branch.c:580
+msgid "Branch rename failed"
+msgstr "Misslyckades byta namn på gren"
+
+#: builtin/branch.c:584
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
+
+#: builtin/branch.c:588
+#, 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:595
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
+
+#: builtin/branch.c:610
+#, c-format
+msgid "malformed object name %s"
+msgstr "felformat objektnamn %s"
+
+#: builtin/branch.c:680
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Misslyckades slå upp HEAD som giltig referens"
+
+#: builtin/branch.c:686
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD hittades inte under refs/heads!"
+
+#: builtin/branch.c:706
+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/bundle.c:47
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s är okej\n"
+
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
+msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
+
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
+msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
+
+#: builtin/checkout.c:107 builtin/checkout.c:135
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "sökvägen \"%s\" har inte vår version"
+
+#: builtin/checkout.c:109 builtin/checkout.c:137
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "sökvägen \"%s\" har inte deras version"
+
+#: builtin/checkout.c:120
+#, c-format
+msgid "path '%s' does not have all three versions"
+msgstr "sökvägen \"%s\" har inte alla tre versionerna"
+
+#: builtin/checkout.c:155
+#, c-format
+msgid "path '%s' does not have all 3 versions"
+msgstr "sökvägen \"%s\" har inte alla 3 versionerna"
+
+#: builtin/checkout.c:172
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "sökväg \"%s\": kan inte slå ihop"
+
+#: builtin/checkout.c:189
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
+
+#: builtin/checkout.c:194 builtin/reset.c:170
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
+
+#: builtin/checkout.c:216 builtin/checkout.c:371
+msgid "corrupt index file"
+msgstr "indexfilen är trasig"
+
+#: builtin/checkout.c:244 builtin/checkout.c:251
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "sökvägen \"%s\" har inte slagits ihop"
+
+#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658
+#: builtin/merge.c:737
+msgid "unable to write new index file"
+msgstr "kunde inte skriva ny indexfil"
+
+#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367
+msgid "diff_setup_done failed"
+msgstr "diff_setup_done misslyckades"
+
+#: builtin/checkout.c:393
+msgid "you need to resolve your current index first"
+msgstr "du måste lösa ditt befintliga index först"
+
+#: builtin/checkout.c:524
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr "Kan inte skapa referenslog för \"%s\"\n"
+
+#: builtin/checkout.c:550
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Redan på \"%s\"\n"
+
+#: builtin/checkout.c:554
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Växlade till och nollställde grenen \"%s\"\n"
+
+#: builtin/checkout.c:556
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Växlade till en ny gren \"%s\"\n"
+
+#: builtin/checkout.c:558
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Växlade till grenen \"%s\"\n"
+
+#: builtin/checkout.c:575
+msgid "HEAD is now at"
+msgstr "HEAD är nu på"
+
+#: builtin/checkout.c:603
+msgid "You are on a branch yet to be born"
+msgstr "Du är på en gren som ännu inte är född"
+
+#: builtin/checkout.c:617
+msgid "Previous HEAD position was"
+msgstr "Tidigare position för HEAD var"
+
+#: builtin/checkout.c:730
+msgid "-B cannot be used with -b"
+msgstr "-B kan inte användas med -b"
+
+#: builtin/checkout.c:738
+msgid "--patch is incompatible with all other options"
+msgstr "--patch är inkompatibel med alla andra flaggor"
+
+#: builtin/checkout.c:744
+msgid "--track needs a branch name"
+msgstr "--track behöver ett namn på en gren"
+
+#: builtin/checkout.c:751
+msgid "Missing branch name; try -b"
+msgstr "Grennamn saknas; försök med -b"
+
+#: builtin/checkout.c:757
+msgid "--orphan and -b|-B are mutually exclusive"
+msgstr "--orphan och --b|-B kan inte användas samtidigt"
+
+#: builtin/checkout.c:759
+msgid "--orphan cannot be used with -t"
+msgstr "--orphan kan inte användas med -t"
+
+#: builtin/checkout.c:769
+msgid "git checkout: -f and -m are incompatible"
+msgstr "git checkout: -f och -m är inkompatibla"
+
+#. case (1)
+#: builtin/checkout.c:815
+#, c-format
+msgid "invalid reference: %s"
+msgstr "felaktig referens: %s"
+
+#. case (1): want a tree
+#: builtin/checkout.c:852
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referensen är inte ett träd: %s"
+
+#: builtin/checkout.c:878
+msgid "invalid path specification"
+msgstr "felaktig sökvägsangivelse"
+
+#: builtin/checkout.c:886
+#, c-format
+msgid ""
+"git checkout: updating paths is incompatible with switching branches.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"
+"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?"
+
+#: builtin/checkout.c:888
+msgid "git checkout: updating paths is incompatible with switching branches."
+msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."
+
+#: builtin/checkout.c:893
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
+"du checkar ut från indexet."
+
+#: builtin/checkout.c:904
+#, c-format
+msgid "git checkout: we do not like '%s' as a branch name."
+msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
+
+#: builtin/checkout.c:909
+#, c-format
+msgid "git checkout: branch %s already exists"
+msgstr "git checkout: grenen %s finns redan"
+
+#: builtin/checkout.c:916
+msgid "Cannot switch branch to a non-commit."
+msgstr "Kan inte växla gren på en icke-incheckning."
+
+#: builtin/checkout.c:919
+msgid "--ours/--theirs is incompatible with switching branches."
+msgstr "--ours/--theirs är inkompatibla när du växlar gren."
+
+#: builtin/clean.c:78
+msgid "-x and -X cannot be used together"
+msgstr "-x och -X kan inte användas samtidigt"
+
+#: builtin/clean.c:82
+msgid ""
+"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+msgstr ""
+"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar städa"
+
+#: builtin/clean.c:85
+msgid ""
+"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; vägrar städa"
+
+#: builtin/clean.c:154 builtin/clean.c:175
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Skulle ta bort %s\n"
+
+#: builtin/clean.c:158 builtin/clean.c:178
+#, c-format
+msgid "Removing %s\n"
+msgstr "Tar bort %s\n"
+
+#: builtin/clean.c:161 builtin/clean.c:181
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
+#: builtin/clean.c:165
+#, c-format
+msgid "Would not remove %s\n"
+msgstr "Skulle inte ta bort %s\n"
+
+#: builtin/clean.c:167
+#, c-format
+msgid "Not removing %s\n"
+msgstr "Tar inte bort %s\n"
+
+#: builtin/clone.c:208
+#, c-format
+msgid "reference repository '%s' is not a local directory."
+msgstr "referensarkivet \"%s\" är inte en lokal katalog."
+
+#: builtin/clone.c:235
+#, c-format
+msgid "failed to open '%s'"
+msgstr "misslyckades öppna \"%s\""
+
+#: builtin/clone.c:239
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "misslyckades skapa katalogen \"%s\""
+
+#: builtin/clone.c:241 builtin/diff.c:74
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "misslyckades ta status på \"%s\""
+
+#: builtin/clone.c:243
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s finns och är ingen katalog"
+
+#: builtin/clone.c:257
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "misslyckades ta status på %s\n"
+
+#: builtin/clone.c:267
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "misslyckades ta bort länken \"%s\""
+
+#: builtin/clone.c:272
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "misslyckades skapa länken \"%s\""
+
+#: builtin/clone.c:276
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "misslyckades kopiera filen till \"%s\""
+
+#: builtin/clone.c:305
+#, c-format
+msgid "done.\n"
+msgstr "klart.\n"
+
+#: builtin/clone.c:387
+msgid "Too many arguments."
+msgstr "För många argument."
+
+#: builtin/clone.c:391
+msgid "You must specify a repository to clone."
+msgstr "Du måste ange ett arkiv att klona."
+
+#: builtin/clone.c:399
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "flaggorna --bare och --origin %s är inkompatibla."
+
+#: builtin/clone.c:428
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
+
+#: builtin/clone.c:438
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "arbetsträdet \"%s\" finns redan."
+
+#: builtin/clone.c:451 builtin/clone.c:465
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "kunde inte skapa inledande kataloger för \"%s\""
+
+#: builtin/clone.c:454
+#, c-format
+msgid "could not create work tree dir '%s'."
+msgstr "kunde inte skapa arbetskatalogen \"%s\""
+
+#: builtin/clone.c:470
+#, c-format
+msgid "Cloning into bare repository %s"
+msgstr "Klonar till ett naket arkiv %s"
+
+#: builtin/clone.c:472
+#, c-format
+msgid "Cloning into %s"
+msgstr "Klonar till %s"
+
+#: builtin/clone.c:530
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr "Vet inte hur man klonar %s"
+
+#: builtin/clone.c:569
+#, c-format
+msgid "Remote branch %s not found in upstream %s, using HEAD instead"
+msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället"
+
+#: builtin/clone.c:579
+msgid "You appear to have cloned an empty repository."
+msgstr "Du verkar ha klonat ett tomt arkiv."
+
+#: builtin/clone.c:621
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
+
+#: builtin/commit.c:41
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"If the identity used for this commit is wrong, you can fix it with:\n"
+"\n"
+" git commit --amend --author='Your Name <you@example.com>'\n"
+msgstr ""
+"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
+"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
+"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
+"\n"
+" git config --global user.name \"Ditt namn\"\n"
+" git config --global user.email du@example.com\n"
+"\n"
+"Om identiteten som användes för incheckningen är felaktig kan du\n"
+"rätta den med:\n"
+"\n"
+" git commit --amend --author='Ditt namn <du@example.com>'\n"
+
+#: builtin/commit.c:53
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"Du bad om att utöka den senaste incheckningen, men om du gör det\n"
+"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
+"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
+
+#: builtin/commit.c:271
+msgid "failed to unpack HEAD tree object"
+msgstr "misslyckades packa upp HEAD:s trädobjekt"
+
+#: builtin/commit.c:299
+msgid "interactive add failed"
+msgstr "interaktiv tilläggning misslyckades"
+
+#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396
+msgid "unable to write new_index file"
+msgstr "kunde inte skriva filen new_index"
+
+#: builtin/commit.c:380
+msgid "cannot do a partial commit during a merge."
+msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
+
+#: builtin/commit.c:389
+msgid "cannot read the index"
+msgstr "kan inte läsa indexet"
+
+#: builtin/commit.c:409
+msgid "unable to write temporary index file"
+msgstr "kunde inte skriva temporär indexfil"
+
+#: builtin/commit.c:456 builtin/commit.c:1294
+msgid "could not parse HEAD commit"
+msgstr "kunde inte tolka HEAD:s incheckning"
+
+#: builtin/commit.c:475 builtin/commit.c:481
+#, c-format
+msgid "invalid commit: %s"
+msgstr "felaktig incheckning: %s"
+
+#: builtin/commit.c:499
+msgid "malformed --author parameter"
+msgstr "felformad \"--author\"-flagga"
+
+#: builtin/commit.c:573 builtin/shortlog.c:299
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(läser loggmeddelande från standard in)\n"
+
+#: builtin/commit.c:575
+msgid "could not read log from standard input"
+msgstr "kunde inte läsa logg från standard in"
+
+#: builtin/commit.c:579
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "kunde inte läsa loggfilen \"%s\""
+
+#: builtin/commit.c:585
+msgid "commit has empty message"
+msgstr "incheckningen har ett tomt meddelande"
+
+#: builtin/commit.c:591
+msgid "could not read MERGE_MSG"
+msgstr "kunde inte läsa MERGE_MSG"
+
+#: builtin/commit.c:595
+msgid "could not read SQUASH_MSG"
+msgstr "kunde inte läsa SQUASH_MSG"
+
+#: builtin/commit.c:599
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
+#: builtin/commit.c:612
+#, c-format
+msgid "could not open '%s'"
+msgstr "kunde inte öppna \"%s\""
+
+#: builtin/commit.c:636
+msgid "could not write commit template"
+msgstr "kunde inte skriva incheckningsmall"
+
+#: builtin/commit.c:650
+#, c-format
+msgid ""
+"#\n"
+"# It looks like you may be committing a MERGE.\n"
+"# If this is not correct, please remove the file\n"
+"#\t%s\n"
+"# and try again.\n"
+"#\n"
+msgstr ""
+"#\n"
+"# Det verkar som du checkar in en SAMMANSLAGNING.\n"
+"# Om det inte stämmer tar du bort filen\n"
+"#\t%s\n"
+"# och försöker igen.\n"
+"#\n"
+
+#: builtin/commit.c:659
+#, c-format
+msgid ""
+"\n"
+"# Please enter the commit message for your changes."
+msgstr ""
+"\n"
+"# Ange ett incheckningsmeddelande för dina ändringar."
+
+#: builtin/commit.c:663
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+" Rader som inleds\n"
+"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
+""
+
+#: builtin/commit.c:668
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be kept; you may remove them yourself if you want to.\n"
+"# An empty message aborts the commit.\n"
+msgstr ""
+" Rader som inleds\n"
+"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
+"# Ett tomt meddelande avbryter incheckningen.\n"
+
+#: builtin/commit.c:680
+#, c-format
+msgid "%s# Author: %s\n"
+msgstr "%s# Författare: %s\n"
+
+#: builtin/commit.c:688
+#, c-format
+msgid "%s# Committer: %s\n"
+msgstr "%s# Incheckare: %s\n"
+
+#: builtin/commit.c:705
+msgid "Cannot read index"
+msgstr "Kan inte läsa indexet"
+
+#: builtin/commit.c:737
+msgid "Error building trees"
+msgstr "Fel vid byggande av träd"
+
+#: builtin/commit.c:752 builtin/tag.c:321
+#, 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:832
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr "Hittade ingen befintlig författare med \"%s\""
+
+#: builtin/commit.c:847 builtin/commit.c:1039
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Ogiltigt läge för ospårade filer: \"%s\""
+
+#: builtin/commit.c:864
+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:878
+msgid "You have nothing to amend."
+msgstr "Du har inget att utöka."
+
+#: builtin/commit.c:880
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Du är i mitten av en incheckning -- kan inte utöka."
+
+#: builtin/commit.c:889
+msgid "Only one of -c/-C/-F can be used."
+msgstr "Kan endast använda en av -c/-C/-F."
+
+#: builtin/commit.c:891
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
+
+#: builtin/commit.c:897
+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:906
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "kunde inte slå upp incheckningen %s"
+
+#: builtin/commit.c:909
+#, c-format
+msgid "could not parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#: builtin/commit.c:937
+msgid "Only one of --include/--only/--all/--interactive can be used."
+msgstr "Endast en av --include/--only/--all/--interactive kan användas."
+
+#: builtin/commit.c:939
+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:941
+msgid "Clever... amending the last one with dirty index."
+msgstr "Smart... utöka den senaste med smutsigt index."
+
+#: builtin/commit.c:943
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..."
+
+#: builtin/commit.c:953
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Felaktigt städningsläge %s"
+
+#: builtin/commit.c:958
+msgid "Paths with -a does not make sense."
+msgstr "Kan inte ange sökvägar med -a."
+
+#: builtin/commit.c:960
+msgid "Paths with --interactive does not make sense."
+msgstr "Kan inte ange sökvägar med --interactive."
+
+#: builtin/commit.c:1142
+msgid "couldn't look up newly created commit"
+msgstr "kunde inte slå upp en precis skapad incheckning"
+
+#: builtin/commit.c:1144
+msgid "could not parse newly created commit"
+msgstr "kunde inte tolka en precis skapad incheckning"
+
+#: builtin/commit.c:1185
+msgid "detached HEAD"
+msgstr "frånkopplad HEAD"
+
+#: builtin/commit.c:1187
+msgid " (root-commit)"
+msgstr " (rotincheckning)"
+
+#: builtin/commit.c:1307 builtin/merge.c:461
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "kunde inte öppna \"%s\" för läsning"
+
+#: builtin/commit.c:1312
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Trasig MERGE_HEAD-fil (%s)"
+
+#: builtin/commit.c:1319
+msgid "could not read MERGE_MODE"
+msgstr "kunde inte läsa MERGE_MODE"
+
+#: builtin/commit.c:1336
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "kunde inte läsa incheckningsmeddelande: %s"
+
+#: builtin/commit.c:1350
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
+
+#: builtin/commit.c:1358
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
+#: builtin/commit.c:1375
+msgid "cannot lock HEAD ref"
+msgstr "kunde inte låsa HEAD-referens"
+
+#: builtin/commit.c:1379
+msgid "cannot update HEAD ref"
+msgstr "kunde inte uppdatera HEAD-referens"
+
+#: builtin/commit.c:1388
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full or quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"Arkivet har uppdaterats, men kunde inte skriva filen\n"
+"new_index. Kontrollera att disken inte är full och\n"
+"att kvoten inte har överskridits, och kör sedan\n"
+"\"git reset HEAD\" för att återställa."
+
+#: builtin/describe.c:205
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "den dekorerade taggen %s inte tillgänglig"
+
+#: builtin/describe.c:209
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "den dekorerade taggen %s har inget inbäddat namn"
+
+#: builtin/describe.c:211
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
+
+#: builtin/describe.c:238
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Objektnamnet är inte giltigt: %s"
+
+#: builtin/describe.c:241
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s är inte ett giltigt \"%s\"-objekt"
+
+#: builtin/describe.c:258
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "ingen tagg motsvarar \"%s\" exakt"
+
+#: builtin/describe.c:260
+#, c-format
+msgid "searching to describe %s\n"
+msgstr "söker för att beskriva %s\n"
+
+#: builtin/describe.c:295
+#, c-format
+msgid "finished search at %s\n"
+msgstr "avslutade sökning på %s\n"
+
+#: builtin/describe.c:319
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Inga dekorerade taggar kan beskriva \"%s\".\n"
+"Det finns dock odekorerade taggar: testa --tags."
+
+#: builtin/describe.c:323
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Inga taggar kan beskriva \"%s\".\n"
+"Testa --always, eller skapa några taggar."
+
+#: builtin/describe.c:344
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "traverserade %lu incheckningar\n"
+
+#: builtin/describe.c:347
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"mer än %i taggar hittades; listar de %i senaste\n"
+"gav upp sökningen vid %s\n"
+
+#: builtin/describe.c:398
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long är inkompatibel med --abbrev=0"
+
+#: builtin/describe.c:423
+msgid "No names found, cannot describe anything."
+msgstr "Inga namn hittades, kan inte beskriva något."
+
+#: builtin/describe.c:430
+msgid "--dirty is incompatible with committishes"
+msgstr "--dirty är inkompatibelt med \"committish\"-värden"
+
+#: builtin/diff.c:76
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "\"%s\": inte en normal fil eller symbolisk länk"
+
+#: builtin/diff.c:225
+#, c-format
+msgid "invalid option: %s"
+msgstr "ogiltig flagga: %s"
+
+#: builtin/diff.c:302
+msgid "Not a git repository"
+msgstr "Inte ett git-arkiv"
+
+#: builtin/diff.c:334
+msgid "No HEAD commit to compare with (yet)"
+msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"
+
+#: builtin/diff.c:349
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "objektet \"%s\" som angavs är felaktigt."
+
+#: builtin/diff.c:354
+#, c-format
+msgid "more than %d trees given: '%s'"
+msgstr "mer än %d träd angavs: \"%s\""
+
+#: builtin/diff.c:364
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "mer än två blobbar angavs: \"%s\""
+
+#: builtin/diff.c:372
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "ej hanterat objekt \"%s\" angavs."
+
+#: builtin/fetch.c:172
+msgid "Couldn't find remote ref HEAD"
+msgstr "Kunde inte hitta fjärr-referensen HEAD"
+
+#: builtin/fetch.c:225
+#, c-format
+msgid "object %s not found"
+msgstr "objektet %s hittades inte"
+
+#: builtin/fetch.c:230
+msgid "[up to date]"
+msgstr "[àjour]"
+
+#.
+#. * If this is the head, and it's not okay to update
+#. * the head, and the old value of the head isn't empty...
+#.
+#: builtin/fetch.c:243
+#, 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:244 builtin/fetch.c:306
+msgid "[rejected]"
+msgstr "[refuserad]"
+
+#: builtin/fetch.c:254
+msgid "[tag update]"
+msgstr "[uppdaterad tagg]"
+
+#: builtin/fetch.c:255 builtin/fetch.c:277 builtin/fetch.c:290
+msgid " (unable to update local ref)"
+msgstr " (kunde inte uppdatera lokal ref)"
+
+#: builtin/fetch.c:267
+msgid "[new tag]"
+msgstr "[ny tagg]"
+
+#: builtin/fetch.c:271
+msgid "[new branch]"
+msgstr "[ny gren]"
+
+#: builtin/fetch.c:302
+msgid "unable to update local ref"
+msgstr "kunde inte uppdatera lokal ref"
+
+#: builtin/fetch.c:302
+msgid "forced update"
+msgstr "tvingad uppdatering"
+
+#: builtin/fetch.c:307
+msgid "(non-fast-forward)"
+msgstr "(ej snabbspolad)"
+
+#: builtin/fetch.c:325 builtin/fetch.c:648
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr "kan inte öppna %s. %s\n"
+
+#: builtin/fetch.c:403
+#, c-format
+msgid "From %.*s\n"
+msgstr "Från %.*s\n"
+
+#: builtin/fetch.c:414
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"några 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:464
+msgid "could not run rev-list"
+msgstr "kunde inte köra rev-list"
+
+#: builtin/fetch.c:478
+#, c-format
+msgid "failed write to rev-list: %s"
+msgstr "kunde inte skriva till rev-list: %s"
+
+#: builtin/fetch.c:485
+#, c-format
+msgid "failed to close rev-list's stdin: %s"
+msgstr "kunde inte stänga rev-list:s standard in: %s"
+
+#: builtin/fetch.c:512
+#, c-format
+msgid " (%s will become dangling)\n"
+msgstr " (%s kommer bli dinglande)\n"
+
+#: builtin/fetch.c:513
+#, c-format
+msgid " (%s has become dangling)\n"
+msgstr " (%s har blivit dinglande)\n"
+
+#: builtin/fetch.c:520
+msgid "[deleted]"
+msgstr "[borttagen]"
+
+#: builtin/fetch.c:521
+msgid "(none)"
+msgstr "(ingen)"
+
+#: builtin/fetch.c:638
+#, 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:672
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "Vet inte hur man hämtar från %s"
+
+#: builtin/fetch.c:726
+#, 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:729
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Flaggan \"%s\" ignoreras för %s\n"
+
+#: builtin/fetch.c:818
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Hämtar %s\n"
+
+#: builtin/fetch.c:820
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Kunde inte hämta %s"
+
+#: builtin/fetch.c:836
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"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:856
+msgid "You need to specify a tag name."
+msgstr "Du måste ange namnet på en tagg."
+
+#: builtin/fetch.c:896
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all tar inte namnet på ett arkiv som argument"
+
+#: builtin/fetch.c:898
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all kan inte anges med referensspecifikationer"
+
+#: builtin/fetch.c:909
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Fjärren eller fjärrgruppen finns inte: %s"
+
+#: builtin/fetch.c:917
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
+
+#: builtin/gc.c:63
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Felaktigt %s: \"%s\""
+
+#: builtin/gc.c:78
+msgid "Too many options specified"
+msgstr "För många flaggor angavs"
+
+#: builtin/gc.c:103
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr "tokigt lång objektkatalog %.*s"
+
+#: builtin/gc.c:220
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
+
+#: builtin/gc.c:223
+#, c-format
+msgid ""
+"Auto packing the repository for optimum performance. You may also\n"
+"run \"git gc\" manually. See \"git help gc\" for more information."
+msgstr ""
+"Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
+"köra \"git gc\" manuellt. Se \"git help gc\" för mer information."
+
+#: builtin/gc.c:251
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort dem."
+
+#: builtin/grep.c:252
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: misslyckades skapa tråd. %s"
+
+#: builtin/grep.c:457
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "\"%s\" kunde inte läsa %s"
+
+#: builtin/grep.c:508
+#, c-format
+msgid "'%s': %s"
+msgstr "\"%s\": %s"
+
+#: builtin/grep.c:519
+#, c-format
+msgid "'%s': short read %s"
+msgstr "\"%s\": kort läsning %s"
+
+#: builtin/grep.c:581
+#, c-format
+msgid "Failed to chdir: %s"
+msgstr "Kunde inte byta katalog (chdir): %s"
+
+#: builtin/grep.c:671 builtin/grep.c:697
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "kunde inte läsa träd (%s)"
+
+#: builtin/grep.c:703
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "Kunde inte \"grep\" från objekt av typen %s"
+
+#: builtin/grep.c:755
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "flaggan \"%c\" antar ett numeriskt värde"
+
+#: builtin/grep.c:771
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kan inte öppna \"%s\""
+
+#: builtin/grep.c:1012
+msgid "no pattern given."
+msgstr "inget mönster angavs."
+
+#: builtin/grep.c:1016
+msgid "cannot mix --fixed-strings and regexp"
+msgstr "kan inte blanda --fixed-strings och reguljära uttryck"
+
+#: builtin/grep.c:1041
+#, c-format
+msgid "bad object %s"
+msgstr "felaktigt objekt %s"
+
+#: builtin/grep.c:1068
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
+
+#: builtin/grep.c:1093
+msgid "--cached cannot be used with --no-index."
+msgstr "--cached kan inte användas med --no-index."
+
+#: builtin/grep.c:1095
+msgid "--no-index cannot be used with revs."
+msgstr "--no-index kan inte användas med revisioner."
+
+#: builtin/grep.c:1104
+msgid "both --cached and trees are given."
+msgstr "både --cached och träd angavs."
+
+#: builtin/init-db.c:34
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Kunde inte göra %s skrivbar för grubben"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "insanely long template name %s"
+msgstr "tokigt långt namn på mallen %s"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "kan inte ta status på \"%s\""
+
+#: builtin/init-db.c:72
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "kan inte ta status på mallen \"%s\""
+
+#: builtin/init-db.c:79
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "kan inte öppna katalogen (opendir) \"%s\""
+
+#: builtin/init-db.c:96
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "kan inte läsa länk (readlink) \"%s\""
+
+#: builtin/init-db.c:98
+#, c-format
+msgid "insanely long symlink %s"
+msgstr "tokigt lång symbolisk länk %s"
+
+#: builtin/init-db.c:101
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
+
+#: builtin/init-db.c:105
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "kan inte kopiera \"%s\" till \"%s\""
+
+#: builtin/init-db.c:109
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignorerar mallen %s"
+
+#: builtin/init-db.c:132
+#, c-format
+msgid "insanely long template path %s"
+msgstr "tokigt lång mallsökväg %s"
+
+#: builtin/init-db.c:140
+#, c-format
+msgid "templates not found %s"
+msgstr "mallarna hittades inte %s"
+
+#: builtin/init-db.c:153
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
+
+#: builtin/init-db.c:191
+#, c-format
+msgid "insane git directory %s"
+msgstr "tokig git-katalog %s"
+
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#: builtin/init-db.c:355
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr "%s%s Git-arkiv i %s%s\n"
+
+#: builtin/init-db.c:356
+msgid "Reinitialized existing"
+msgstr "Ominitierade befintligt"
+
+#: builtin/init-db.c:356
+msgid "Initialized empty"
+msgstr "Initierade tomt"
+
+#: builtin/init-db.c:357
+msgid " shared"
+msgstr " delat"
+
+#: builtin/init-db.c:376
+msgid "cannot tell cwd"
+msgstr "kan inte läsa aktuell katalog (cwd)"
+
+#: builtin/init-db.c:450 builtin/init-db.c:457
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "kan inte skapa katalogen (mkdir) %s"
+
+#: builtin/init-db.c:461
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "kan inte byta katalog (chdir) till %s"
+
+#: builtin/init-db.c:483
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller "
+"--git-dir=<katalog>)"
+
+#: builtin/init-db.c:509
+msgid "Cannot access current working directory"
+msgstr "Kan inte komma åt aktuell arbetskatalog"
+
+#: builtin/init-db.c:512
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Kan inte komma åt arbetskatalogen \"%s\""
+
+#: builtin/log.c:104
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "felaktigt värde till --decorate: %s"
+
+#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "okänt argument: %s"
+
+#: builtin/log.c:156
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Slututdata: %d %s\n"
+
+#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428
+#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184
+msgid "revision walk setup failed"
+msgstr "misslyckades skapa revisionstraversering"
+
+#: builtin/log.c:347 builtin/log.c:434
+#, c-format
+msgid "Could not read object %s"
+msgstr "Kunde inte läsa objektet %s"
+
+#: builtin/log.c:458
+#, c-format
+msgid "Unknown type: %d"
+msgstr "Okänd typ: %d"
+
+#: builtin/log.c:558
+msgid "format.headers without value"
+msgstr "format.headers utan värde"
+
+#: builtin/log.c:630
+msgid "name of output directory is too long"
+msgstr "namn på utdatakatalogen är för lång"
+
+#: builtin/log.c:641
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "Kan inte öppna patchfilen %s"
+
+#: builtin/log.c:655
+msgid "Need exactly one range."
+msgstr "Behöver precis ett intervall."
+
+#: builtin/log.c:663
+msgid "Not a range."
+msgstr "Inte ett intervall."
+
+#: builtin/log.c:700
+msgid "Could not extract email from committer identity."
+msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
+
+#: builtin/log.c:732
+msgid "Cover letter needs email format"
+msgstr "Omslagsbrevet behöver e-postformat"
+
+#: builtin/log.c:825
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "tokigt in-reply-to: %s"
+
+#: builtin/log.c:898
+msgid "Two output directories?"
+msgstr "Två utdatakataloger?"
+
+#: builtin/log.c:1087
+#, c-format
+msgid "bogus committer info %s"
+msgstr "felaktig incheckarinformation %s"
+
+#: builtin/log.c:1132
+msgid "-n and -k are mutually exclusive."
+msgstr "-n och -k kan inte användas samtidigt."
+
+#: builtin/log.c:1134
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr "--subject-prefix och -k kan inte användas samtidigt."
+
+#: builtin/log.c:1141
+msgid "--name-only does not make sense"
+msgstr "kan inte använda --name-only"
+
+#: builtin/log.c:1143
+msgid "--name-status does not make sense"
+msgstr "kan inte använda --name-status"
+
+#: builtin/log.c:1145
+msgid "--check does not make sense"
+msgstr "kan inte använda --check"
+
+#: builtin/log.c:1166
+msgid "standard output, or directory, which one?"
+msgstr "standard ut, eller katalog, vilken skall det vara?"
+
+#: builtin/log.c:1168
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "Kunde inte skapa katalogen \"%s\""
+
+#: builtin/log.c:1307
+msgid "Failed to create output files"
+msgstr "Misslyckades skapa utdatafiler"
+
+#: builtin/log.c:1394
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
+
+#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Okänd incheckning %s"
+
+#: builtin/merge.c:82
+msgid "switch `m' requires a value"
+msgstr "flaggan \"m\" behöver ett värde"
+
+#: builtin/merge.c:119
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
+
+#: builtin/merge.c:120
+#, c-format
+msgid "Available strategies are:"
+msgstr "Tillgängliga strategier är:"
+
+#: builtin/merge.c:125
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Tillgängliga skräddarsydda strategier är:"
+
+#: builtin/merge.c:223
+msgid "could not run stash."
+msgstr "kunde köra stash."
+
+#: builtin/merge.c:228
+msgid "stash failed"
+msgstr "stash misslyckades"
+
+#: builtin/merge.c:233
+#, c-format
+msgid "not a valid object: %s"
+msgstr "inte ett giltigt objekt: %s"
+
+#: builtin/merge.c:250
+msgid "read-tree failed"
+msgstr "read-tree misslyckades"
+
+#: builtin/merge.c:279
+msgid " (nothing to squash)"
+msgstr " (inget att platta till)"
+
+#: builtin/merge.c:292
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299
+#: builtin/merge.c:1309
+#, c-format
+msgid "Could not write to '%s'"
+msgstr "Kunde inte skriva till \"%s\""
+
+#: builtin/merge.c:323
+msgid "Writing SQUASH_MSG"
+msgstr "Skriver SQUASH_MSG"
+
+#: builtin/merge.c:325
+msgid "Finishing SQUASH_MSG"
+msgstr "Avslutar SQUASH_MSG"
+
+#: builtin/merge.c:345
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:396
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "\"%s\" verkar inte peka på en incheckning"
+
+#: builtin/merge.c:491
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
+
+#: builtin/merge.c:553
+msgid "git write-tree failed to write a tree"
+msgstr "git write--tree misslyckades skriva ett träd"
+
+#: builtin/merge.c:594
+msgid "failed to read the cache"
+msgstr "misslyckads läsa cachen"
+
+#: builtin/merge.c:611
+msgid "Unable to write index."
+msgstr "Kunde inte skriva indexet."
+
+#: builtin/merge.c:624
+msgid "Not handling anything other than two heads merge."
+msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
+
+#: builtin/merge.c:651
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#: builtin/merge.c:666
+#, c-format
+msgid "unable to write %s"
+msgstr "kunde inte skriva %s"
+
+#: builtin/merge.c:791
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Underbart.\n"
+
+#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295
+#: builtin/merge.c:1303
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "Kunde inte öppna \"%s\" för skrivning"
+
+#: builtin/merge.c:856
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
+
+#: builtin/merge.c:871
+#, c-format
+msgid "'%s' is not a commit"
+msgstr "\"%s\" är inte en incheckning"
+
+#: builtin/merge.c:921
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
+"Checka in dina ändringar innan du kan slå ihop."
+
+#: builtin/merge.c:924
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
+
+#: builtin/merge.c:951
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#: builtin/merge.c:956
+msgid "You cannot combine --no-ff with --ff-only."
+msgstr "Du kan inte kombinera --no-ff med --ff-only."
+
+#: builtin/merge.c:984
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
+
+#: builtin/merge.c:987
+msgid "Squash commit into empty head not supported yet"
+msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
+
+#: builtin/merge.c:989
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
+
+#: builtin/merge.c:993 builtin/merge.c:1041
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - inte något vi kan slå ihop"
+
+#: builtin/merge.c:1099
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Uppdaterar %s..%s\n"
+
+#: builtin/merge.c:1133
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
+
+#: builtin/merge.c:1137
+#, c-format
+msgid "Nope.\n"
+msgstr "Nej.\n"
+
+#: builtin/merge.c:1170
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: builtin/merge.c:1196 builtin/merge.c:1269
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Återspolar trädet till ofördärvat...\n"
+
+#: builtin/merge.c:1200
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Försöker sammanslagninsstrategin %s...\n"
+
+#: builtin/merge.c:1261
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
+
+#: builtin/merge.c:1263
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Sammanslaning med strategin %s misslyckades.\n"
+
+#: builtin/merge.c:1271
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Använder %s för att förbereda lösning för hand.\n"
+
+#: builtin/merge.c:1314
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
+
+#: builtin/mv.c:107
+msgid "bad source"
+msgstr "felaktig källa"
+
+#: builtin/mv.c:110
+msgid "can not move directory into itself"
+msgstr "kan inte flytta katalog till sig själv"
+
+#: builtin/mv.c:113
+msgid "cannot move directory over file"
+msgstr "kan inte flytta katalog över fil"
+
+#: builtin/mv.c:123
+#, c-format
+msgid "Huh? %.*s is in index?"
+msgstr "Vad? %.*s är i indexet?"
+
+#: builtin/mv.c:135
+msgid "source directory is empty"
+msgstr "källkatalogen är tom"
+
+#: builtin/mv.c:166
+msgid "not under version control"
+msgstr "inte versionshanterad"
+
+#: builtin/mv.c:168
+msgid "destination exists"
+msgstr "destinationen finns"
+
+#: builtin/mv.c:175
+#, c-format
+msgid "%s; will overwrite!"
+msgstr "%s; kommer skriva över!"
+
+#: builtin/mv.c:178
+msgid "Cannot overwrite"
+msgstr "Kan inte skriva över"
+
+#: builtin/mv.c:181
+msgid "multiple sources for the same target"
+msgstr "flera källor för samma mål"
+
+#: builtin/mv.c:196
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, källa=%s, mål=%s"
+
+#: builtin/mv.c:206
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Byter namn på %s till %s\n"
+
+#: builtin/mv.c:209
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "misslyckades byta namn på \"%s\""
+
+#: builtin/notes.c:122
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "kunde int estarta \"show\" för objektet \"%s\""
+
+#: builtin/notes.c:128
+msgid "can't fdopen 'show' output fd"
+msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"
+
+#: builtin/notes.c:138
+#, c-format
+msgid "failed to close pipe to 'show' for object '%s'"
+msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""
+
+#: builtin/notes.c:141
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
+
+#: builtin/notes.c:158 builtin/tag.c:311
+#, c-format
+msgid "could not create file '%s'"
+msgstr "kunde inte skapa filen \"%s\""
+
+#: builtin/notes.c:172
+msgid "Please supply the note contents using either -m or -F option"
+msgstr "Ange innehåll för anteckningen med antingen -m eller -F"
+
+#: builtin/notes.c:193 builtin/notes.c:797
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Tar bort anteckning för objektet %s\n"
+
+#: builtin/notes.c:198
+msgid "unable to write note object"
+msgstr "kunde inte skriva anteckningsobjekt"
+
+#: builtin/notes.c:200
+#, c-format
+msgid "The note contents has been left in %s"
+msgstr "Anteckningens innehåll har lämnats kvar i %s"
+
+#: builtin/notes.c:234 builtin/tag.c:445
+#, c-format
+msgid "cannot read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
+#: builtin/notes.c:236 builtin/tag.c:448
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "kunde inte öppna eller läsa \"%s\""
+
+#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446
+#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631
+#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752
+#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
+
+#: builtin/notes.c:258
+#, c-format
+msgid "Failed to read object '%s'."
+msgstr "Kunde inte läsa objektet \"%s\"."
+
+#: builtin/notes.c:283
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
+
+#: builtin/notes.c:295
+msgid "Failed to write current notes tree to database"
+msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen"
+
+#: builtin/notes.c:307
+msgid "Failed to commit notes tree to database"
+msgstr "Kunde inte checka in anteckningsträd i databasen"
+
+#: builtin/notes.c:339
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
+
+#: builtin/notes.c:349
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: builtin/notes.c:376
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Felaktigt värde på %s: \"%s\""
+
+#: builtin/notes.c:440
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Felaktig indatarad: \"%s\"."
+
+#: builtin/notes.c:455
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
+
+# FIXME: Untranslatable!
+#. TRANSLATORS: The first %s is one of "git notes ACTION",
+#. e.g. "add", "copy", "append" etc.
+#: builtin/notes.c:481
+#, c-format
+#
+msgid "Refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)"
+
+#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614
+#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745
+#: builtin/notes.c:782 builtin/notes.c:821
+msgid "too many parameters"
+msgstr "för många parametrar"
+
+#: builtin/notes.c:505
+msgid "list"
+msgstr "list"
+
+#: builtin/notes.c:514 builtin/notes.c:758
+#, c-format
+msgid "No note found for object %s."
+msgstr "Inga anteckningar hittades för objektet %s."
+
+#: builtin/notes.c:567
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
+"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
+
+#: builtin/notes.c:572 builtin/notes.c:649
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Skriver över befintliga anteckningar för objektet %s\n"
+
+#: builtin/notes.c:622
+msgid "too few parameters"
+msgstr "för få parametrar"
+
+#: builtin/notes.c:638
+msgid "copy"
+msgstr "copy"
+
+#: builtin/notes.c:643
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
+"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
+
+#: builtin/notes.c:655
+#, c-format
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
+
+#: builtin/notes.c:703
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
+"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
+
+#: builtin/notes.c:754
+msgid "show"
+msgstr "show"
+
+#: builtin/notes.c:791
+msgid "remove"
+msgstr "remove"
+
+#: builtin/notes.c:795
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "Objektet %s har ingen anteckning\n"
+
+#: builtin/notes.c:825
+msgid "prune"
+msgstr "prune"
+
+#: builtin/notes.c:877
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Okänt underkommando: %s"
+
+#: builtin/push.c:43
+msgid "tag shorthand without <tag>"
+msgstr "taggförkortning utan <tagg>"
+
+#: builtin/push.c:62
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete godtar endast enkla målreferensnamn"
+
+#: builtin/push.c:72
+msgid "You are not currently on a branch."
+msgstr "Du är inte på någon gren för närvarande."
+
+#: builtin/push.c:74
+#, c-format
+msgid "The current branch %s is not tracking anything."
+msgstr "Den aktuella grenen %s spårar ingenting."
+
+#: builtin/push.c:77
+#, c-format
+msgid "The current branch %s is tracking multiple branches, refusing to push."
+msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."
+
+#: builtin/push.c:100
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Du angav inga referensspecifikationer att sända, och push.default är \"nothing\"."
+
+#: builtin/push.c:120
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Sänder till %s\n"
+
+#: builtin/push.c:124
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "misslyckades sända några referenser till \"%s\""
+
+#: builtin/push.c:132
+#, c-format
+msgid ""
+"To prevent you from losing history, non-fast-forward updates were rejected\n"
+"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
+"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgstr ""
+"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n"
+"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n"
+"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n"
+
+#: builtin/push.c:149
+#, c-format
+msgid "bad repository '%s'"
+msgstr "felaktigt arkiv \"%s\""
+
+#: builtin/push.c:150
+msgid "No destination configured to push to."
+msgstr "Har inte ställt in någon destination att sända till."
+
+#: builtin/push.c:158
+msgid "--all and --tags are incompatible"
+msgstr "--all och --tags är inkompatibla"
+
+#: builtin/push.c:159
+msgid "--all can't be combined with refspecs"
+msgstr "--all kan inte kombineras med referensspecifikationer"
+
+#: builtin/push.c:164
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror och --tags är inkompatibla"
+
+#: builtin/push.c:165
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror kan inte kombineras med referensspecifikationer"
+
+#: builtin/push.c:170
+msgid "--all and --mirror are incompatible"
+msgstr "--all och --mirror är inkompatibla"
+
+#: builtin/push.c:235
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete är imkompatibel med --all, --mirror och --tags"
+
+#: builtin/push.c:237
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete kan inte användas utan referenser"
+
+#: builtin/reset.c:33
+msgid "mixed"
+msgstr "blandad"
+
+#: builtin/reset.c:33
+msgid "soft"
+msgstr "mjuk"
+
+#: builtin/reset.c:33
+msgid "hard"
+msgstr "hård"
+
+#: builtin/reset.c:33
+msgid "merge"
+msgstr "sammanslagning"
+
+#: builtin/reset.c:33
+msgid "keep"
+msgstr "behåll"
+
+#: builtin/reset.c:95
+msgid "You do not have a valid HEAD."
+msgstr "Du har inte en giltig HEAD."
+
+#: builtin/reset.c:97
+msgid "Failed to find tree of HEAD."
+msgstr "Kunde inte hitta träder för HEAD."
+
+#: builtin/reset.c:103
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Kunde inte hitta träder för %s."
+
+#: builtin/reset.c:108
+msgid "Could not write new index file."
+msgstr "Kunde inte skriva ny indexfil."
+
+#: builtin/reset.c:118
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD är nu på %s"
+
+#: builtin/reset.c:142
+msgid "Could not read index"
+msgstr "Kunde inte läsa indexet"
+
+#: builtin/reset.c:145
+msgid "Unstaged changes after reset:"
+msgstr "Oköade ändringar efter återställning:"
+
+#: builtin/reset.c:225
+#, c-format
+msgid "Reflog action message too long: %.*s..."
+msgstr "Reflog-händelsemeddelande för långt: %.*s..."
+
+#: builtin/reset.c:231
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
+
+#: builtin/reset.c:307
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Kan inte tolka objektet \"%s\""
+
+#: builtin/reset.c:312
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
+
+#: builtin/reset.c:321
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
+
+#: builtin/reset.c:323
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Kan inte göra %s återställning med sökvägar."
+
+#: builtin/reset.c:335
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "%s återställning tillåts inte i ett naket arkiv"
+
+#: builtin/reset.c:351
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
+
+#: builtin/revert.c:82
+msgid "program error"
+msgstr "programfel"
+
+#: builtin/revert.c:154 builtin/revert.c:188
+#, c-format
+msgid "Could not read commit message of %s"
+msgstr "Kunde inte läsa incheckningsmeddelandet för %s"
+
+#: builtin/revert.c:202
+#, c-format
+msgid "Could not extract author email from %s"
+msgstr "Kunde inte hämta författarens e-postadress från %s"
+
+#: builtin/revert.c:214
+#, c-format
+msgid "Could not extract author time from %s"
+msgstr "Kunde inte hämta författartid från %s"
+
+#: builtin/revert.c:230
+#, c-format
+msgid "No author information found in %s"
+msgstr "Hittade ingen författarinformation i %s"
+
+#: builtin/revert.c:267
+#, c-format
+msgid "Could not write to %s."
+msgstr "Kunde inte skriva till %s."
+
+#: builtin/revert.c:270
+#, c-format
+msgid "Error wrapping up %s"
+msgstr "Fel vid ombrytning av %s"
+
+#: builtin/revert.c:290
+msgid ""
+"Your local changes would be overwritten by revert.\n"
+"Please, commit your changes or stash them to proceed."
+msgstr ""
+"Dina lokala ändringar skulle skrivas över av \"revert\".\n"
+"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
+
+#: builtin/revert.c:293
+msgid ""
+"Your local changes would be overwritten by cherry-pick.\n"
+"Please, commit your changes or stash them to proceed."
+msgstr ""
+"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n"
+"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
+
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: builtin/revert.c:351
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Kunde inte skriva ny indexfil"
+
+#: builtin/revert.c:417
+msgid "Your index file is unmerged."
+msgstr "Din indexfil har inte slagits ihop."
+
+#: builtin/revert.c:420
+msgid "You do not have a valid HEAD"
+msgstr "Du har ingen giltig HEAD"
+
+#: builtin/revert.c:428
+msgid "Cannot revert a root commit"
+msgstr "Kan inte ångra en rotincheckning"
+
+#: builtin/revert.c:437
+#, 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."
+
+#: builtin/revert.c:445
+#, c-format
+msgid "Commit %s does not have parent %d"
+msgstr "Incheckning %s har inte förälder %d"
+
+#: builtin/revert.c:449
+#, 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
+#: builtin/revert.c:460
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: kan inte tolka föräldraincheckningen %s"
+
+#: builtin/revert.c:464
+#, c-format
+msgid "Cannot get commit message for %s"
+msgstr "Kan inte hämta incheckningsmeddelande för %s"
+
+#: builtin/revert.c:525
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "kunde inte ångra %s... %s"
+
+#: builtin/revert.c:526
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "kunde inte applicera %s... %s"
+
+#: builtin/revert.c:559
+msgid "empty commit set passed"
+msgstr "den angivna uppsättningen incheckningar är tom"
+
+#: builtin/revert.c:573
+msgid "cherry-pick --ff cannot be used with --signoff"
+msgstr "cherry-pick --ff kan inte användas med --signoff"
+
+#: builtin/revert.c:575
+msgid "cherry-pick --ff cannot be used with --no-commit"
+msgstr "cherry-pick --ff kan inte användas med --no-commit"
+
+#: builtin/revert.c:577
+msgid "cherry-pick --ff cannot be used with -x"
+msgstr "cherry-pick --ff kan inte användas med -x"
+
+#: builtin/revert.c:579
+msgid "cherry-pick --ff cannot be used with --edit"
+msgstr "cherry-pick --ff kan inte användas med --edit"
+
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: builtin/revert.c:584
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: misslyckades läsa indexet"
+
+#: builtin/rm.c:118
+#, c-format
+msgid ""
+"'%s' has staged content different from both the file and the HEAD\n"
+"(use -f to force removal)"
+msgstr ""
+"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"
+"(använd -f för att tvinga borttagning)"
+
+#: builtin/rm.c:124
+#, c-format
+msgid ""
+"'%s' has changes staged in the index\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\"%s\" har köade ändringar i indexet\n"
+"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
+
+#: builtin/rm.c:128
+#, c-format
+msgid ""
+"'%s' has local modifications\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\"%s\" har lokala ändringar\n"
+"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
+
+#: builtin/rm.c:202
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "tar inte bort \"%s\" rekursivt utan -r"
+
+#: builtin/rm.c:238
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: kan inte ta bort %s"
+
+#: builtin/shortlog.c:161
+#, c-format
+msgid "Missing author: %s"
+msgstr "Saknad författare: %s"
+
+#: builtin/tag.c:123 builtin/tag.c:464
+#, c-format
+msgid "tag name too long: %.*s..."
+msgstr "taggnamnet för långt: %.*s..."
+
+#: builtin/tag.c:128
+#, c-format
+msgid "tag '%s' not found."
+msgstr "taggen \"%s\" hittades inte."
+
+#: builtin/tag.c:143
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Tog bort tagg \"%s\" (var %s)\n"
+
+#: builtin/tag.c:155
+#, c-format
+msgid "could not verify the tag '%s'"
+msgstr "kunde inte bekräfta taggen \"%s\""
+
+#: builtin/tag.c:170
+msgid "committer info too long."
+msgstr "incheckarinformation för lång."
+
+#: builtin/tag.c:190
+msgid "could not run gpg."
+msgstr "kunde inte köra gpg."
+
+#: builtin/tag.c:196
+msgid "gpg did not accept the tag data"
+msgstr "gpg godtog inte taggdata"
+
+#: builtin/tag.c:203
+msgid "gpg failed to sign the tag"
+msgstr "gpg misslyckades signera taggen"
+
+#: builtin/tag.c:218
+msgid ""
+"\n"
+"#\n"
+"# Write a tag message\n"
+"#\n"
+msgstr ""
+"\n"
+"#\n"
+"# Skriv ett taggmeddelande\n"
+"#\n"
+
+#: builtin/tag.c:226
+#, c-format
+msgid "signing key value too long (%.10s...)"
+msgstr "signeringsnyckelvärdet för långt (%.10s...)"
+
+#: builtin/tag.c:272
+msgid "unable to sign the tag"
+msgstr "kunde inte signera taggen"
+
+#: builtin/tag.c:274
+msgid "unable to write tag file"
+msgstr "kunde inte skriva tagg-filen"
+
+#: builtin/tag.c:289
+msgid "bad object type."
+msgstr "felaktig objekttyp"
+
+#: builtin/tag.c:302
+msgid "tag header too big."
+msgstr "tagghuvud för stort."
+
+#: builtin/tag.c:329
+msgid "no tag message?"
+msgstr "inget taggmeddelande?"
+
+#: builtin/tag.c:335
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Taggmeddelandet har lämnats i %s\n"
+
+#: builtin/tag.c:428
+msgid "-n option is only allowed with -l."
+msgstr "Flaggan -n är endast tillåten tillsammans med -l."
+
+#: builtin/tag.c:430
+msgid "--contains option is only allowed with -l."
+msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
+
+#: builtin/tag.c:438
+msgid "only one -F or -m option is allowed."
+msgstr "endast en av flaggorna -F eller -m tillåts."
+
+#: builtin/tag.c:458
+msgid "too many params"
+msgstr "för många parametrar"
+
+#: builtin/tag.c:466
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "\"%s\" är inte ett giltigt taggnamn."
+
+#: builtin/tag.c:471
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "taggen \"%s\" finns redan"
+
+#: builtin/tag.c:479
+#, c-format
+msgid "%s: cannot lock the ref"
+msgstr "%s: kan inte låsa referensen"
+
+#: builtin/tag.c:481
+#, c-format
+msgid "%s: cannot update the ref"
+msgstr "%s: kan inte uppdatera referensen"
+
+#: builtin/tag.c:483
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:5
+msgid "See 'git help COMMAND' for more information on a specific command."
+msgstr "Se \"git help KOMMANDO\" för mer information om ett specifikt kommando."
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:10
+msgid "TEST: A C test string"
+msgstr "TEST: A C test string"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:13
+#, c-format
+msgid "TEST: A C test string %s"
+msgstr "TEST: A C test string %s"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:16
+#, c-format
+msgid "TEST: Hello World!"
+msgstr "TEST: Hello World!"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:19
+#, c-format
+msgid "TEST: Old English Runes"
+msgstr "TEST: Old English Runes"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.c:22
+#, c-format
+msgid "TEST: ‘single’ and “double” quotes"
+msgstr "TEST: ‘single’ and “double” quotes"
+
+#: git-am.sh:47
+msgid "You need to set your committer info first"
+msgstr "Du måste ställa in din incheckarinformation först"
+
+#: git-am.sh:80
+#, sh-format
+msgid ""
+"When you have resolved this problem run \"$cmdline --resolved\".\n"
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
+msgstr ""
+"När du har löst problemet kör du \"$cmdline --resolved\".\n"
+"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
+"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+
+#: git-am.sh:96
+msgid "Cannot fall back to three-way merge."
+msgstr "Kan inte falla tillbaka på trevägssammanslagning."
+
+#: git-am.sh:111
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "Arkivet saknar objekt som behövs för att falla tillbaka på 3-vägssammanslagning."
+
+#: git-am.sh:120
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Vill du handredigera din patch?\n"
+"Den kan inte appliceras på blobbar som antecknats i dess index."
+
+#: git-am.sh:236
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Endast en StGIT-patchserie kan appliceras åt gången"
+
+#: git-am.sh:288
+#, sh-format
+msgid "Patch format $patch_format is not supported."
+msgstr "Patchformatet $patch_format stöds inte."
+
+#: git-am.sh:290
+msgid "Patch format detection failed."
+msgstr "Misslyckades detektera patchformat."
+
+#: git-am.sh:340
+msgid "-d option is no longer supported. Do not use."
+msgstr "Flaggan -d stöds inte lägre. Använd inte."
+
+#: git-am.sh:403
+#, sh-format
+msgid "previous rebase directory $dotest still exists but mbox given."
+msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs."
+
+#: git-am.sh:408
+msgid "Please make up your mind. --skip or --abort?"
+msgstr "Bestäm dig. --skip eller --abort?"
+
+#: git-am.sh:434
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Lösningsoperation pågår inte, vi återupptar inte."
+
+#: git-am.sh:499
+#, sh-format
+msgid "Dirty index: cannot apply patches (dirty: $files)"
+msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)"
+
+#: git-am.sh:595
+#, sh-format
+msgid ""
+"Patch is empty. Was it split wrong?\n"
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
+msgstr ""
+"Patchen är tom. Delades den upp felaktigt?\n"
+"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
+"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+
+#: git-am.sh:632
+msgid "Patch does not have a valid e-mail address."
+msgstr "Patchen har inte någon giltig e-postadress."
+
+#: git-am.sh:679
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
+
+#: git-am.sh:683
+msgid "Commit Body is:"
+msgstr "Incheckningskroppen är:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#: git-am.sh:690
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "
+
+#: git-am.sh:726
+#, sh-format
+msgid "Applying: $FIRSTLINE"
+msgstr "Applicerar: $FIRSTLINE"
+
+#: git-am.sh:747
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"Inga ändrinar - glömde du använda \"git add\"?\n"
+"Om det inte är något kvar att köa kan det hända att någon annan redan\n"
+"introducerat samma ändringar; kanske du bör hoppa över patchen."
+
+#: git-am.sh:755
+msgid ""
+"You still have unmerged paths in your index\n"
+"did you forget to use 'git add'?"
+msgstr ""
+"Du har fortfarande sökvägar som inte slagits samman i ditt index\n"
+"glömde du använda \"git add\"?"
+
+#: git-am.sh:771
+msgid "No changes -- Patch already applied."
+msgstr "Inga ändringar -- Patchen har redan applicerats."
+
+#: git-am.sh:781
+#, sh-format
+msgid "Patch failed at $msgnum $FIRSTLINE"
+msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
+
+#: git-am.sh:797
+msgid "applying to an empty history"
+msgstr "applicerar på en tom historik"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.sh:8
+msgid "TEST: A Shell test string"
+msgstr "TEST: A Shell test string"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.sh:11
+#, sh-format
+msgid "TEST: A Shell test $variable"
+msgstr "TEST: A Shell test $variable"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.perl:8
+msgid "TEST: A Perl test string"
+msgstr "TEST: A Perl test string"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#: t/t0200/test.perl:11
+#, perl-format
+msgid "TEST: A Perl test variable %s"
+msgstr "TEST: A Perl test variable %s"
+
--
1.7.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-12 20:10 [PATCH 2/2] Add Swedish translation Peter Krefting
@ 2010-09-12 23:03 ` Ævar Arnfjörð Bjarmason
2010-09-13 7:15 ` Peter Krefting
2010-09-13 10:12 ` Peter Kjellerstedt
1 sibling, 1 reply; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-12 23:03 UTC (permalink / raw)
To: Peter Krefting; +Cc: git
On Sun, Sep 12, 2010 at 20:10, Peter Krefting <peter@softwolves.pp.se> wrote:
Nice work! Good to have a complete translation into some language.
But, nits:
* Doesn't follow the "Initializing a .po file" docs in
t/README. Here's what you get after applying the little Perl
cleanup program there to it:
diff --git a/po/sv.po b/po/sv.po
index 26fa0a6..273760d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,54 +1,38 @@
-# Swedish translation of git
-# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
-# Peter Krefting <peter@softwolves.pp.se>, 2010.
-#
msgid ""
msgstr ""
"Project-Id-Version: git 1.7.3\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2010-09-10 20:09+0100\n"
-"PO-Revision-Date: 2010-09-12 21:07+0100\n"
-"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);"
-#: wt-status.c:56
msgid "# Unmerged paths:"
msgstr "# Ej sammanslagna sökvägar:"
-#: wt-status.c:62 wt-status.c:79
#, c-format
msgid "# (use \"git reset %s <file>...\" to unstage)"
msgstr "# (använd \"git reset %s <fil>...\" för att ta bort från kö)"
etc. It removes the extra custom header you put at the top
too. Maybe we should have copyright headers like that for the *.po
files too, but I was operating under the assumption that the
git.git history would suffice.
* Commit message should be "po/sv.po: add Swedish translation". It
makes it much easier to `git log --grep=po/` or `git log
--grep=po/sv.po` in the future.
* You're translating the TEST: messages, it's redundant except for
Icelandic (which uses it for git.git tests), but I can see how it
can be painful to have non-100% translation coverage.
Maybe I should adjust the xgettext invocation in the Makefile so
those t/* strings aren't extracted by default to work around that.
> Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
> ---
> po/sv.po | 2947 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 2947 insertions(+), 0 deletions(-)
> create mode 100644 po/sv.po
>
> diff --git a/po/sv.po b/po/sv.po
> new file mode 100644
> index 0000000..26fa0a6
> --- /dev/null
> +++ b/po/sv.po
> @@ -0,0 +1,2947 @@
> +# Swedish translation of git
> +# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
> +# Peter Krefting <peter@softwolves.pp.se>, 2010.
> +#
> +msgid ""
> +msgstr ""
> +"Project-Id-Version: git 1.7.3\n"
> +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
> +"POT-Creation-Date: 2010-09-10 20:09+0100\n"
> +"PO-Revision-Date: 2010-09-12 21:07+0100\n"
> +"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
> +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
> +"MIME-Version: 1.0\n"
> +"Content-Type: text/plain; charset=UTF-8\n"
> +"Content-Transfer-Encoding: 8bit\n"
> +"Plural-Forms: nplurals=2; plural=(n != 1);"
> +
> +#: wt-status.c:56
> +msgid "# Unmerged paths:"
> +msgstr "# Ej sammanslagna sökvägar:"
> +
> +#: wt-status.c:62 wt-status.c:79
> +#, c-format
> +msgid "# (use \"git reset %s <file>...\" to unstage)"
> +msgstr "# (använd \"git reset %s <fil>...\" för att ta bort från kö)"
> +
> +#: wt-status.c:64 wt-status.c:81
> +msgid "# (use \"git rm --cached <file>...\" to unstage)"
> +msgstr "# (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
> +
> +#: wt-status.c:65
> +msgid "# (use \"git add/rm <file>...\" as appropriate to mark resolution)"
> +msgstr "# (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
> +
> +#: wt-status.c:73
> +msgid "# Changes to be committed:"
> +msgstr "# Ändringar att checka in:"
> +
> +#: wt-status.c:91
> +msgid "# Changed but not updated:"
> +msgstr "# Ändrade men inte uppdaterade:"
> +
> +#: wt-status.c:95
> +msgid "# (use \"git add <file>...\" to update what will be committed)"
> +msgstr "# (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
> +
> +#: wt-status.c:97
> +msgid "# (use \"git add/rm <file>...\" to update what will be committed)"
> +msgstr "# (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
> +
> +#: wt-status.c:98
> +msgid ""
> +"# (use \"git checkout -- <file>...\" to discard changes in working "
> +"directory)"
> +msgstr ""
> +"# (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
> +"arbetskatalogen)"
> +
> +#: wt-status.c:100
> +msgid "# (commit or discard the untracked or modified content in submodules)"
> +msgstr "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
> +
> +#: wt-status.c:109
> +#, c-format
> +msgid "# %s files:"
> +msgstr "# %s filer:"
> +
> +#: wt-status.c:112
> +#, c-format
> +msgid "# (use \"git %s <file>...\" to include in what will be committed)"
> +msgstr "# (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"
> +
> +#: wt-status.c:129
> +msgid "bug"
> +msgstr "programfel"
> +
> +#: wt-status.c:134
> +msgid "both deleted:"
> +msgstr "borttaget av bägge:"
> +
> +#: wt-status.c:135
> +msgid "added by us:"
> +msgstr "tillagt av oss:"
> +
> +#: wt-status.c:136
> +msgid "deleted by them:"
> +msgstr "borttaget av dem:"
> +
> +#: wt-status.c:137
> +msgid "added by them:"
> +msgstr "tillagt av dem:"
> +
> +#: wt-status.c:138
> +msgid "deleted by us:"
> +msgstr "borttaget av oss:"
> +
> +#: wt-status.c:139
> +msgid "both added:"
> +msgstr "tillagt av bägge:"
> +
> +#: wt-status.c:140
> +msgid "both modified:"
> +msgstr "ändrat av bägge:"
> +
> +#: wt-status.c:170
> +msgid "new commits, "
> +msgstr "nya incheckningar, "
> +
> +#: wt-status.c:172
> +msgid "modified content, "
> +msgstr "ändrat innehåll, "
> +
> +#: wt-status.c:174
> +msgid "untracked content, "
> +msgstr "ospårat innehåll, "
> +
> +#: wt-status.c:188
> +#, c-format
> +msgid "new file: %s"
> +msgstr "ny fil: %s"
> +
> +#: wt-status.c:191
> +#, c-format
> +msgid "copied: %s -> %s"
> +msgstr "kopierad: %s -> %s"
> +
> +#: wt-status.c:194
> +#, c-format
> +msgid "deleted: %s"
> +msgstr "borttagen: %s"
> +
> +#: wt-status.c:197
> +#, c-format
> +msgid "modified: %s"
> +msgstr "ändrad: %s"
> +
> +#: wt-status.c:200
> +#, c-format
> +msgid "renamed: %s -> %s"
> +msgstr "namnbyte: %s -> %s"
> +
> +#: wt-status.c:203
> +#, c-format
> +msgid "typechange: %s"
> +msgstr "typbyte: %s"
> +
> +#: wt-status.c:206
> +#, c-format
> +msgid "unknown: %s"
> +msgstr "okänd: %s"
> +
> +#: wt-status.c:209
> +#, c-format
> +msgid "unmerged: %s"
> +msgstr "osammansl.: %s"
> +
> +#: wt-status.c:212
> +#, c-format
> +msgid "bug: unhandled diff status %c"
> +msgstr "programfel: diff-status %c ej hanterad"
> +
> +#: wt-status.c:635
> +msgid "On branch "
> +msgstr "På grenen "
> +
> +#: wt-status.c:642
> +msgid "Not currently on any branch."
> +msgstr "Inte på någon gren för närvarande."
> +
> +#: wt-status.c:652
> +msgid "# Initial commit"
> +msgstr "# Grundincheckning"
> +
> +#: wt-status.c:666
> +msgid "Untracked"
> +msgstr "Ospårad"
> +
> +#: wt-status.c:666 builtin/notes.c:562
> +msgid "add"
> +msgstr "add"
> +
> +#: wt-status.c:668
> +msgid "Ignored"
> +msgstr "Ignorerad"
> +
> +#: wt-status.c:668
> +msgid "add -f"
> +msgstr "add -f"
> +
> +#: wt-status.c:670
> +#, c-format
> +msgid "# Untracked files not listed%s\n"
> +msgstr "# Ospårade filer visas ej%s\n"
> +
> +#: wt-status.c:672
> +msgid " (use -u option to show untracked files)"
> +msgstr " (använd flaggan -u för att visa ospårade filer)"
> +
> +#: wt-status.c:678
> +#, c-format
> +msgid "# No changes\n"
> +msgstr "# Inga ändringar\n"
> +
> +#: wt-status.c:682
> +#, c-format
> +msgid "no changes added to commit%s\n"
> +msgstr "inga ändringar att checka in%s\n"
> +
> +#: wt-status.c:684
> +msgid " (use \"git add\" and/or \"git commit -a\")"
> +msgstr " (använd \"git add\" och/eller \"git commit -a\")"
> +
> +#: wt-status.c:686
> +#, c-format
> +msgid "nothing added to commit but untracked files present%s\n"
> +msgstr "inget köat för incheckning, men ospårade filer finns%s\n"
> +
> +#: wt-status.c:688
> +msgid " (use \"git add\" to track)"
> +msgstr " (använd \"git add\" för att spåra)"
> +
> +#: wt-status.c:691
> +msgid " (create/copy files and use \"git add\" to track)"
> +msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"
> +
> +#: wt-status.c:693 wt-status.c:696
> +#, c-format
> +msgid "nothing to commit%s\n"
> +msgstr "inget att checka in%s\n"
> +
> +#: wt-status.c:694
> +msgid " (use -u to show untracked files)"
> +msgstr " (använd -u för att visa ospårade filer)"
> +
> +#: wt-status.c:697
> +msgid " (working directory clean)"
> +msgstr " (arbetskatalogen ren)"
> +
> +#: wt-status.c:795
> +msgid "HEAD (no branch)"
> +msgstr "HEAD (ingen gren)"
> +
> +#: wt-status.c:801
> +msgid "Initial commit on "
> +msgstr "Grundincheckning på "
> +
> +#: wt-status.c:816
> +msgid "behind "
> +msgstr "efter "
> +
> +#: wt-status.c:819 wt-status.c:822
> +msgid "ahead "
> +msgstr "före "
> +
> +#: wt-status.c:824
> +msgid ", behind "
> +msgstr ", efter "
> +
> +#: builtin/add.c:41
> +#, c-format
> +msgid "unexpected diff status %c"
> +msgstr "diff-status %c förväntades inte"
> +
> +#: builtin/add.c:67 builtin/commit.c:244
> +msgid "updating files failed"
> +msgstr "misslyckades uppdatera filer"
> +
> +#: builtin/add.c:77
> +#, c-format
> +msgid "remove '%s'\n"
> +msgstr "ta bort \"%s\"\n"
> +
> +#: builtin/add.c:175
> +#, c-format
> +msgid "Path '%s' is in submodule '%.*s'"
> +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
> +
> +#: builtin/add.c:191
> +msgid "Unstaged changes after refreshing the index:"
> +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
> +
> +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194
> +#, c-format
> +msgid "pathspec '%s' did not match any files"
> +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
> +
> +#: builtin/add.c:208
> +#, c-format
> +msgid "'%s' is beyond a symbolic link"
> +msgstr "\"%s\" är på andra sidan av en symbolisk länk"
> +
> +#: builtin/add.c:275
> +msgid "Could not read the index"
> +msgstr "Kunde inte läsa indexet"
> +
> +#: builtin/add.c:284
> +#, c-format
> +msgid "Could not open '%s' for writing."
> +msgstr "Kunde inte öppna \"%s\" för skrivning"
> +
> +#: builtin/add.c:288
> +msgid "Could not write patch"
> +msgstr "Kunde inte skriva patch"
> +
> +#: builtin/add.c:293
> +#, c-format
> +msgid "Could not stat '%s'"
> +msgstr "Kunde inte ta status på \"%s\""
> +
> +#: builtin/add.c:295
> +msgid "Empty patch. Aborted."
> +msgstr "Tom patch. Avbryter."
> +
> +#: builtin/add.c:301
> +#, c-format
> +msgid "Could not apply '%s'"
> +msgstr "Kunde inte applicera \"%s\""
> +
> +#: builtin/add.c:349
> +#, c-format
> +msgid "Use -f if you really want to add them.\n"
> +msgstr "Använd -f om du verkligen vill lägga till dem.\n"
> +
> +#: builtin/add.c:350
> +msgid "no files added"
> +msgstr "inga filer har lagts till"
> +
> +#: builtin/add.c:356
> +msgid "adding files failed"
> +msgstr "misslyckades lägga till filer"
> +
> +#: builtin/add.c:388
> +msgid "-A and -u are mutually incompatible"
> +msgstr "-A och -u är ömsesidigt inkompatibla"
> +
> +#: builtin/add.c:390
> +msgid "Option --ignore-missing can only be used together with --dry-run"
> +msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
> +
> +#: builtin/add.c:410
> +#, c-format
> +msgid "Nothing specified, nothing added.\n"
> +msgstr "Inget angivet, inget tillagt.\n"
> +
> +#: builtin/add.c:411
> +#, c-format
> +msgid "Maybe you wanted to say 'git add .'?\n"
> +msgstr "Kanske menade du att skriva \"git add .\"?\n"
> +
> +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301
> +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171
> +msgid "index file corrupt"
> +msgstr "indexfilen trasig"
> +
> +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268
> +msgid "Unable to write new index file"
> +msgstr "Kunde inte skriva ny indexfil"
> +
> +#: builtin/archive.c:17
> +#, c-format
> +msgid "could not create archive file '%s'"
> +msgstr "Kunde inte skapa arkivfilen \"%s\""
> +
> +#: builtin/archive.c:20
> +msgid "could not redirect output"
> +msgstr "kunde inte omdirigera utdata"
> +
> +#: builtin/archive.c:36
> +msgid "git archive: Remote with no URL"
> +msgstr "git archive: Fjärr utan URL"
> +
> +#: builtin/archive.c:46
> +msgid "git archive: expected ACK/NAK, got EOF"
> +msgstr "git archive: förväntade ACK/NAK, fick EOF"
> +
> +#: builtin/archive.c:51
> +#, c-format
> +msgid "git archive: NACK %s"
> +msgstr "git archive: NACK %s"
> +
> +#: builtin/archive.c:52
> +msgid "git archive: protocol error"
> +msgstr "git archive: protokollfel"
> +
> +#: builtin/archive.c:57
> +msgid "git archive: expected a flush"
> +msgstr "git archive: förväntade en tömning (flush)"
> +
> +#: builtin/branch.c:136
> +#, c-format
> +msgid ""
> +"deleting branch '%s' that has been merged to\n"
> +" '%s', but it is not yet merged to HEAD."
> +msgstr ""
> +"tar bort grenen \"%s\" som inte har slagits ihop med\n"
> +" \"%s\", men som ännu inte slagits ihop med HEAD."
> +
> +#: builtin/branch.c:140
> +#, c-format
> +msgid ""
> +"not deleting branch '%s' that is not yet merged to\n"
> +" '%s', even though it is merged to HEAD."
> +msgstr ""
> +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
> +" \"%s\", trots att den har slagits ihop med HEAD."
> +
> +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
> +#: builtin/branch.c:161
> +msgid "remote "
> +msgstr "fjärr"
> +
> +#: builtin/branch.c:169
> +msgid "cannot use -a with -d"
> +msgstr "kan inte ange -a med -d"
> +
> +#: builtin/branch.c:175
> +msgid "Couldn't look up commit object for HEAD"
> +msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
> +
> +#: builtin/branch.c:180
> +#, c-format
> +msgid "Cannot delete the branch '%s' which you are currently on."
> +msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
> +
> +#: builtin/branch.c:190
> +#, c-format
> +msgid "%sbranch '%s' not found."
> +msgstr "%sgrenen \"%s\" hittades inte."
> +
> +#: builtin/branch.c:198
> +#, c-format
> +msgid "Couldn't look up commit object for '%s'"
> +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
> +
> +#: builtin/branch.c:204
> +#, c-format
> +msgid ""
> +"The branch '%s' is not fully merged.\n"
> +"If you are sure you want to delete it, run 'git branch -D %s'."
> +msgstr ""
> +"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
> +"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
> +
> +#: builtin/branch.c:212
> +#, c-format
> +msgid "Error deleting %sbranch '%s'"
> +msgstr "Fel vid borttagning av %sgrenen \"%s\""
> +
> +#: builtin/branch.c:217
> +#, c-format
> +msgid "Deleted %sbranch %s (was %s).\n"
> +msgstr "Tog bort %sgrenen %s (var %s).\n"
> +
> +#: builtin/branch.c:222
> +msgid "Update of config-file failed"
> +msgstr "Misslyckades uppdatera konfigurationsfil"
> +
> +#: builtin/branch.c:304
> +#, c-format
> +msgid "branch '%s' does not point at a commit"
> +msgstr "grenen \"%s\" pekar inte på en incheckning"
> +
> +#: builtin/branch.c:381
> +#, c-format
> +msgid "behind %d] "
> +msgstr "bakom %d] "
> +
> +#: builtin/branch.c:383
> +#, c-format
> +msgid "ahead %d] "
> +msgstr "före %d] "
> +
> +#: builtin/branch.c:385
> +#, c-format
> +msgid "ahead %d, behind %d] "
> +msgstr "före %d, bakom %d] "
> +
> +#: builtin/branch.c:484
> +msgid "(no branch)"
> +msgstr "(ingen gren)"
> +
> +#: builtin/branch.c:544
> +msgid "some refs could not be read"
> +msgstr "vissa referenser kunde inte läsas"
> +
> +#: builtin/branch.c:557
> +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:567 builtin/branch.c:571
> +#, c-format
> +msgid "Invalid branch name: '%s'"
> +msgstr "Felaktigt namn på gren: \"%s\""
> +
> +#: builtin/branch.c:574
> +#, c-format
> +msgid "A branch named '%s' already exists."
> +msgstr "Det finns redan en gren som heter \"%s\""
> +
> +#: builtin/branch.c:580
> +msgid "Branch rename failed"
> +msgstr "Misslyckades byta namn på gren"
> +
> +#: builtin/branch.c:584
> +#, c-format
> +msgid "Renamed a misnamed branch '%s' away"
> +msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
> +
> +#: builtin/branch.c:588
> +#, 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:595
> +msgid "Branch is renamed, but update of config-file failed"
> +msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
> +
> +#: builtin/branch.c:610
> +#, c-format
> +msgid "malformed object name %s"
> +msgstr "felformat objektnamn %s"
> +
> +#: builtin/branch.c:680
> +msgid "Failed to resolve HEAD as a valid ref."
> +msgstr "Misslyckades slå upp HEAD som giltig referens"
> +
> +#: builtin/branch.c:686
> +msgid "HEAD not found below refs/heads!"
> +msgstr "HEAD hittades inte under refs/heads!"
> +
> +#: builtin/branch.c:706
> +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/bundle.c:47
> +#, c-format
> +msgid "%s is okay\n"
> +msgstr "%s är okej\n"
> +
> +#: builtin/bundle.c:56
> +msgid "Need a repository to create a bundle."
> +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
> +
> +#: builtin/bundle.c:60
> +msgid "Need a repository to unbundle."
> +msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
> +
> +#: builtin/checkout.c:107 builtin/checkout.c:135
> +#, c-format
> +msgid "path '%s' does not have our version"
> +msgstr "sökvägen \"%s\" har inte vår version"
> +
> +#: builtin/checkout.c:109 builtin/checkout.c:137
> +#, c-format
> +msgid "path '%s' does not have their version"
> +msgstr "sökvägen \"%s\" har inte deras version"
> +
> +#: builtin/checkout.c:120
> +#, c-format
> +msgid "path '%s' does not have all three versions"
> +msgstr "sökvägen \"%s\" har inte alla tre versionerna"
> +
> +#: builtin/checkout.c:155
> +#, c-format
> +msgid "path '%s' does not have all 3 versions"
> +msgstr "sökvägen \"%s\" har inte alla 3 versionerna"
> +
> +#: builtin/checkout.c:172
> +#, c-format
> +msgid "path '%s': cannot merge"
> +msgstr "sökväg \"%s\": kan inte slå ihop"
> +
> +#: builtin/checkout.c:189
> +#, c-format
> +msgid "Unable to add merge result for '%s'"
> +msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
> +
> +#: builtin/checkout.c:194 builtin/reset.c:170
> +#, c-format
> +msgid "make_cache_entry failed for path '%s'"
> +msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
> +
> +#: builtin/checkout.c:216 builtin/checkout.c:371
> +msgid "corrupt index file"
> +msgstr "indexfilen är trasig"
> +
> +#: builtin/checkout.c:244 builtin/checkout.c:251
> +#, c-format
> +msgid "path '%s' is unmerged"
> +msgstr "sökvägen \"%s\" har inte slagits ihop"
> +
> +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658
> +#: builtin/merge.c:737
> +msgid "unable to write new index file"
> +msgstr "kunde inte skriva ny indexfil"
> +
> +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367
> +msgid "diff_setup_done failed"
> +msgstr "diff_setup_done misslyckades"
> +
> +#: builtin/checkout.c:393
> +msgid "you need to resolve your current index first"
> +msgstr "du måste lösa ditt befintliga index först"
> +
> +#: builtin/checkout.c:524
> +#, c-format
> +msgid "Can not do reflog for '%s'\n"
> +msgstr "Kan inte skapa referenslog för \"%s\"\n"
> +
> +#: builtin/checkout.c:550
> +#, c-format
> +msgid "Already on '%s'\n"
> +msgstr "Redan på \"%s\"\n"
> +
> +#: builtin/checkout.c:554
> +#, c-format
> +msgid "Switched to and reset branch '%s'\n"
> +msgstr "Växlade till och nollställde grenen \"%s\"\n"
> +
> +#: builtin/checkout.c:556
> +#, c-format
> +msgid "Switched to a new branch '%s'\n"
> +msgstr "Växlade till en ny gren \"%s\"\n"
> +
> +#: builtin/checkout.c:558
> +#, c-format
> +msgid "Switched to branch '%s'\n"
> +msgstr "Växlade till grenen \"%s\"\n"
> +
> +#: builtin/checkout.c:575
> +msgid "HEAD is now at"
> +msgstr "HEAD är nu på"
> +
> +#: builtin/checkout.c:603
> +msgid "You are on a branch yet to be born"
> +msgstr "Du är på en gren som ännu inte är född"
> +
> +#: builtin/checkout.c:617
> +msgid "Previous HEAD position was"
> +msgstr "Tidigare position för HEAD var"
> +
> +#: builtin/checkout.c:730
> +msgid "-B cannot be used with -b"
> +msgstr "-B kan inte användas med -b"
> +
> +#: builtin/checkout.c:738
> +msgid "--patch is incompatible with all other options"
> +msgstr "--patch är inkompatibel med alla andra flaggor"
> +
> +#: builtin/checkout.c:744
> +msgid "--track needs a branch name"
> +msgstr "--track behöver ett namn på en gren"
> +
> +#: builtin/checkout.c:751
> +msgid "Missing branch name; try -b"
> +msgstr "Grennamn saknas; försök med -b"
> +
> +#: builtin/checkout.c:757
> +msgid "--orphan and -b|-B are mutually exclusive"
> +msgstr "--orphan och --b|-B kan inte användas samtidigt"
> +
> +#: builtin/checkout.c:759
> +msgid "--orphan cannot be used with -t"
> +msgstr "--orphan kan inte användas med -t"
> +
> +#: builtin/checkout.c:769
> +msgid "git checkout: -f and -m are incompatible"
> +msgstr "git checkout: -f och -m är inkompatibla"
> +
> +#. case (1)
> +#: builtin/checkout.c:815
> +#, c-format
> +msgid "invalid reference: %s"
> +msgstr "felaktig referens: %s"
> +
> +#. case (1): want a tree
> +#: builtin/checkout.c:852
> +#, c-format
> +msgid "reference is not a tree: %s"
> +msgstr "referensen är inte ett träd: %s"
> +
> +#: builtin/checkout.c:878
> +msgid "invalid path specification"
> +msgstr "felaktig sökvägsangivelse"
> +
> +#: builtin/checkout.c:886
> +#, c-format
> +msgid ""
> +"git checkout: updating paths is incompatible with switching branches.\n"
> +"Did you intend to checkout '%s' which can not be resolved as commit?"
> +msgstr ""
> +"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"
> +"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?"
> +
> +#: builtin/checkout.c:888
> +msgid "git checkout: updating paths is incompatible with switching branches."
> +msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."
> +
> +#: builtin/checkout.c:893
> +msgid ""
> +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
> +"checking out of the index."
> +msgstr ""
> +"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
> +"du checkar ut från indexet."
> +
> +#: builtin/checkout.c:904
> +#, c-format
> +msgid "git checkout: we do not like '%s' as a branch name."
> +msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
> +
> +#: builtin/checkout.c:909
> +#, c-format
> +msgid "git checkout: branch %s already exists"
> +msgstr "git checkout: grenen %s finns redan"
> +
> +#: builtin/checkout.c:916
> +msgid "Cannot switch branch to a non-commit."
> +msgstr "Kan inte växla gren på en icke-incheckning."
> +
> +#: builtin/checkout.c:919
> +msgid "--ours/--theirs is incompatible with switching branches."
> +msgstr "--ours/--theirs är inkompatibla när du växlar gren."
> +
> +#: builtin/clean.c:78
> +msgid "-x and -X cannot be used together"
> +msgstr "-x och -X kan inte användas samtidigt"
> +
> +#: builtin/clean.c:82
> +msgid ""
> +"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
> +msgstr ""
> +"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar städa"
> +
> +#: builtin/clean.c:85
> +msgid ""
> +"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
> +"clean"
> +msgstr ""
> +"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; vägrar städa"
> +
> +#: builtin/clean.c:154 builtin/clean.c:175
> +#, c-format
> +msgid "Would remove %s\n"
> +msgstr "Skulle ta bort %s\n"
> +
> +#: builtin/clean.c:158 builtin/clean.c:178
> +#, c-format
> +msgid "Removing %s\n"
> +msgstr "Tar bort %s\n"
> +
> +#: builtin/clean.c:161 builtin/clean.c:181
> +#, c-format
> +msgid "failed to remove '%s'"
> +msgstr "kunde inte ta bort \"%s\""
> +
> +#: builtin/clean.c:165
> +#, c-format
> +msgid "Would not remove %s\n"
> +msgstr "Skulle inte ta bort %s\n"
> +
> +#: builtin/clean.c:167
> +#, c-format
> +msgid "Not removing %s\n"
> +msgstr "Tar inte bort %s\n"
> +
> +#: builtin/clone.c:208
> +#, c-format
> +msgid "reference repository '%s' is not a local directory."
> +msgstr "referensarkivet \"%s\" är inte en lokal katalog."
> +
> +#: builtin/clone.c:235
> +#, c-format
> +msgid "failed to open '%s'"
> +msgstr "misslyckades öppna \"%s\""
> +
> +#: builtin/clone.c:239
> +#, c-format
> +msgid "failed to create directory '%s'"
> +msgstr "misslyckades skapa katalogen \"%s\""
> +
> +#: builtin/clone.c:241 builtin/diff.c:74
> +#, c-format
> +msgid "failed to stat '%s'"
> +msgstr "misslyckades ta status på \"%s\""
> +
> +#: builtin/clone.c:243
> +#, c-format
> +msgid "%s exists and is not a directory"
> +msgstr "%s finns och är ingen katalog"
> +
> +#: builtin/clone.c:257
> +#, c-format
> +msgid "failed to stat %s\n"
> +msgstr "misslyckades ta status på %s\n"
> +
> +#: builtin/clone.c:267
> +#, c-format
> +msgid "failed to unlink '%s'"
> +msgstr "misslyckades ta bort länken \"%s\""
> +
> +#: builtin/clone.c:272
> +#, c-format
> +msgid "failed to create link '%s'"
> +msgstr "misslyckades skapa länken \"%s\""
> +
> +#: builtin/clone.c:276
> +#, c-format
> +msgid "failed to copy file to '%s'"
> +msgstr "misslyckades kopiera filen till \"%s\""
> +
> +#: builtin/clone.c:305
> +#, c-format
> +msgid "done.\n"
> +msgstr "klart.\n"
> +
> +#: builtin/clone.c:387
> +msgid "Too many arguments."
> +msgstr "För många argument."
> +
> +#: builtin/clone.c:391
> +msgid "You must specify a repository to clone."
> +msgstr "Du måste ange ett arkiv att klona."
> +
> +#: builtin/clone.c:399
> +#, c-format
> +msgid "--bare and --origin %s options are incompatible."
> +msgstr "flaggorna --bare och --origin %s är inkompatibla."
> +
> +#: builtin/clone.c:428
> +#, c-format
> +msgid "destination path '%s' already exists and is not an empty directory."
> +msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
> +
> +#: builtin/clone.c:438
> +#, c-format
> +msgid "working tree '%s' already exists."
> +msgstr "arbetsträdet \"%s\" finns redan."
> +
> +#: builtin/clone.c:451 builtin/clone.c:465
> +#, c-format
> +msgid "could not create leading directories of '%s'"
> +msgstr "kunde inte skapa inledande kataloger för \"%s\""
> +
> +#: builtin/clone.c:454
> +#, c-format
> +msgid "could not create work tree dir '%s'."
> +msgstr "kunde inte skapa arbetskatalogen \"%s\""
> +
> +#: builtin/clone.c:470
> +#, c-format
> +msgid "Cloning into bare repository %s"
> +msgstr "Klonar till ett naket arkiv %s"
> +
> +#: builtin/clone.c:472
> +#, c-format
> +msgid "Cloning into %s"
> +msgstr "Klonar till %s"
> +
> +#: builtin/clone.c:530
> +#, c-format
> +msgid "Don't know how to clone %s"
> +msgstr "Vet inte hur man klonar %s"
> +
> +#: builtin/clone.c:569
> +#, c-format
> +msgid "Remote branch %s not found in upstream %s, using HEAD instead"
> +msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället"
> +
> +#: builtin/clone.c:579
> +msgid "You appear to have cloned an empty repository."
> +msgstr "Du verkar ha klonat ett tomt arkiv."
> +
> +#: builtin/clone.c:621
> +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
> +msgstr "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
> +
> +#: builtin/commit.c:41
> +msgid ""
> +"Your name and email address were configured automatically based\n"
> +"on your username and hostname. Please check that they are accurate.\n"
> +"You can suppress this message by setting them explicitly:\n"
> +"\n"
> +" git config --global user.name \"Your Name\"\n"
> +" git config --global user.email you@example.com\n"
> +"\n"
> +"If the identity used for this commit is wrong, you can fix it with:\n"
> +"\n"
> +" git commit --amend --author='Your Name <you@example.com>'\n"
> +msgstr ""
> +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
> +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
> +"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
> +"\n"
> +" git config --global user.name \"Ditt namn\"\n"
> +" git config --global user.email du@example.com\n"
> +"\n"
> +"Om identiteten som användes för incheckningen är felaktig kan du\n"
> +"rätta den med:\n"
> +"\n"
> +" git commit --amend --author='Ditt namn <du@example.com>'\n"
> +
> +#: builtin/commit.c:53
> +msgid ""
> +"You asked to amend the most recent commit, but doing so would make\n"
> +"it empty. You can repeat your command with --allow-empty, or you can\n"
> +"remove the commit entirely with \"git reset HEAD^\".\n"
> +msgstr ""
> +"Du bad om att utöka den senaste incheckningen, men om du gör det\n"
> +"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
> +"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
> +
> +#: builtin/commit.c:271
> +msgid "failed to unpack HEAD tree object"
> +msgstr "misslyckades packa upp HEAD:s trädobjekt"
> +
> +#: builtin/commit.c:299
> +msgid "interactive add failed"
> +msgstr "interaktiv tilläggning misslyckades"
> +
> +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396
> +msgid "unable to write new_index file"
> +msgstr "kunde inte skriva filen new_index"
> +
> +#: builtin/commit.c:380
> +msgid "cannot do a partial commit during a merge."
> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
> +
> +#: builtin/commit.c:389
> +msgid "cannot read the index"
> +msgstr "kan inte läsa indexet"
> +
> +#: builtin/commit.c:409
> +msgid "unable to write temporary index file"
> +msgstr "kunde inte skriva temporär indexfil"
> +
> +#: builtin/commit.c:456 builtin/commit.c:1294
> +msgid "could not parse HEAD commit"
> +msgstr "kunde inte tolka HEAD:s incheckning"
> +
> +#: builtin/commit.c:475 builtin/commit.c:481
> +#, c-format
> +msgid "invalid commit: %s"
> +msgstr "felaktig incheckning: %s"
> +
> +#: builtin/commit.c:499
> +msgid "malformed --author parameter"
> +msgstr "felformad \"--author\"-flagga"
> +
> +#: builtin/commit.c:573 builtin/shortlog.c:299
> +#, c-format
> +msgid "(reading log message from standard input)\n"
> +msgstr "(läser loggmeddelande från standard in)\n"
> +
> +#: builtin/commit.c:575
> +msgid "could not read log from standard input"
> +msgstr "kunde inte läsa logg från standard in"
> +
> +#: builtin/commit.c:579
> +#, c-format
> +msgid "could not read log file '%s'"
> +msgstr "kunde inte läsa loggfilen \"%s\""
> +
> +#: builtin/commit.c:585
> +msgid "commit has empty message"
> +msgstr "incheckningen har ett tomt meddelande"
> +
> +#: builtin/commit.c:591
> +msgid "could not read MERGE_MSG"
> +msgstr "kunde inte läsa MERGE_MSG"
> +
> +#: builtin/commit.c:595
> +msgid "could not read SQUASH_MSG"
> +msgstr "kunde inte läsa SQUASH_MSG"
> +
> +#: builtin/commit.c:599
> +#, c-format
> +msgid "could not read '%s'"
> +msgstr "kunde inte läsa \"%s\""
> +
> +#: builtin/commit.c:612
> +#, c-format
> +msgid "could not open '%s'"
> +msgstr "kunde inte öppna \"%s\""
> +
> +#: builtin/commit.c:636
> +msgid "could not write commit template"
> +msgstr "kunde inte skriva incheckningsmall"
> +
> +#: builtin/commit.c:650
> +#, c-format
> +msgid ""
> +"#\n"
> +"# It looks like you may be committing a MERGE.\n"
> +"# If this is not correct, please remove the file\n"
> +"#\t%s\n"
> +"# and try again.\n"
> +"#\n"
> +msgstr ""
> +"#\n"
> +"# Det verkar som du checkar in en SAMMANSLAGNING.\n"
> +"# Om det inte stämmer tar du bort filen\n"
> +"#\t%s\n"
> +"# och försöker igen.\n"
> +"#\n"
> +
> +#: builtin/commit.c:659
> +#, c-format
> +msgid ""
> +"\n"
> +"# Please enter the commit message for your changes."
> +msgstr ""
> +"\n"
> +"# Ange ett incheckningsmeddelande för dina ändringar."
> +
> +#: builtin/commit.c:663
> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be ignored, and an empty message aborts the commit.\n"
> +msgstr ""
> +" Rader som inleds\n"
> +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
> +""
> +
> +#: builtin/commit.c:668
> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
> +"# An empty message aborts the commit.\n"
> +msgstr ""
> +" Rader som inleds\n"
> +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
> +"# Ett tomt meddelande avbryter incheckningen.\n"
> +
> +#: builtin/commit.c:680
> +#, c-format
> +msgid "%s# Author: %s\n"
> +msgstr "%s# Författare: %s\n"
> +
> +#: builtin/commit.c:688
> +#, c-format
> +msgid "%s# Committer: %s\n"
> +msgstr "%s# Incheckare: %s\n"
> +
> +#: builtin/commit.c:705
> +msgid "Cannot read index"
> +msgstr "Kan inte läsa indexet"
> +
> +#: builtin/commit.c:737
> +msgid "Error building trees"
> +msgstr "Fel vid byggande av träd"
> +
> +#: builtin/commit.c:752 builtin/tag.c:321
> +#, 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:832
> +#, c-format
> +msgid "No existing author found with '%s'"
> +msgstr "Hittade ingen befintlig författare med \"%s\""
> +
> +#: builtin/commit.c:847 builtin/commit.c:1039
> +#, c-format
> +msgid "Invalid untracked files mode '%s'"
> +msgstr "Ogiltigt läge för ospårade filer: \"%s\""
> +
> +#: builtin/commit.c:864
> +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:878
> +msgid "You have nothing to amend."
> +msgstr "Du har inget att utöka."
> +
> +#: builtin/commit.c:880
> +msgid "You are in the middle of a merge -- cannot amend."
> +msgstr "Du är i mitten av en incheckning -- kan inte utöka."
> +
> +#: builtin/commit.c:889
> +msgid "Only one of -c/-C/-F can be used."
> +msgstr "Kan endast använda en av -c/-C/-F."
> +
> +#: builtin/commit.c:891
> +msgid "Option -m cannot be combined with -c/-C/-F."
> +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
> +
> +#: builtin/commit.c:897
> +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:906
> +#, c-format
> +msgid "could not lookup commit %s"
> +msgstr "kunde inte slå upp incheckningen %s"
> +
> +#: builtin/commit.c:909
> +#, c-format
> +msgid "could not parse commit %s"
> +msgstr "kunde inte tolka incheckningen %s"
> +
> +#: builtin/commit.c:937
> +msgid "Only one of --include/--only/--all/--interactive can be used."
> +msgstr "Endast en av --include/--only/--all/--interactive kan användas."
> +
> +#: builtin/commit.c:939
> +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:941
> +msgid "Clever... amending the last one with dirty index."
> +msgstr "Smart... utöka den senaste med smutsigt index."
> +
> +#: builtin/commit.c:943
> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
> +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..."
> +
> +#: builtin/commit.c:953
> +#, c-format
> +msgid "Invalid cleanup mode %s"
> +msgstr "Felaktigt städningsläge %s"
> +
> +#: builtin/commit.c:958
> +msgid "Paths with -a does not make sense."
> +msgstr "Kan inte ange sökvägar med -a."
> +
> +#: builtin/commit.c:960
> +msgid "Paths with --interactive does not make sense."
> +msgstr "Kan inte ange sökvägar med --interactive."
> +
> +#: builtin/commit.c:1142
> +msgid "couldn't look up newly created commit"
> +msgstr "kunde inte slå upp en precis skapad incheckning"
> +
> +#: builtin/commit.c:1144
> +msgid "could not parse newly created commit"
> +msgstr "kunde inte tolka en precis skapad incheckning"
> +
> +#: builtin/commit.c:1185
> +msgid "detached HEAD"
> +msgstr "frånkopplad HEAD"
> +
> +#: builtin/commit.c:1187
> +msgid " (root-commit)"
> +msgstr " (rotincheckning)"
> +
> +#: builtin/commit.c:1307 builtin/merge.c:461
> +#, c-format
> +msgid "could not open '%s' for reading"
> +msgstr "kunde inte öppna \"%s\" för läsning"
> +
> +#: builtin/commit.c:1312
> +#, c-format
> +msgid "Corrupt MERGE_HEAD file (%s)"
> +msgstr "Trasig MERGE_HEAD-fil (%s)"
> +
> +#: builtin/commit.c:1319
> +msgid "could not read MERGE_MODE"
> +msgstr "kunde inte läsa MERGE_MODE"
> +
> +#: builtin/commit.c:1336
> +#, c-format
> +msgid "could not read commit message: %s"
> +msgstr "kunde inte läsa incheckningsmeddelande: %s"
> +
> +#: builtin/commit.c:1350
> +#, c-format
> +msgid "Aborting commit due to empty commit message.\n"
> +msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
> +
> +#: builtin/commit.c:1358
> +msgid "failed to write commit object"
> +msgstr "kunde inte skriva incheckningsobjekt"
> +
> +#: builtin/commit.c:1375
> +msgid "cannot lock HEAD ref"
> +msgstr "kunde inte låsa HEAD-referens"
> +
> +#: builtin/commit.c:1379
> +msgid "cannot update HEAD ref"
> +msgstr "kunde inte uppdatera HEAD-referens"
> +
> +#: builtin/commit.c:1388
> +msgid ""
> +"Repository has been updated, but unable to write\n"
> +"new_index file. Check that disk is not full or quota is\n"
> +"not exceeded, and then \"git reset HEAD\" to recover."
> +msgstr ""
> +"Arkivet har uppdaterats, men kunde inte skriva filen\n"
> +"new_index. Kontrollera att disken inte är full och\n"
> +"att kvoten inte har överskridits, och kör sedan\n"
> +"\"git reset HEAD\" för att återställa."
> +
> +#: builtin/describe.c:205
> +#, c-format
> +msgid "annotated tag %s not available"
> +msgstr "den dekorerade taggen %s inte tillgänglig"
> +
> +#: builtin/describe.c:209
> +#, c-format
> +msgid "annotated tag %s has no embedded name"
> +msgstr "den dekorerade taggen %s har inget inbäddat namn"
> +
> +#: builtin/describe.c:211
> +#, c-format
> +msgid "tag '%s' is really '%s' here"
> +msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
> +
> +#: builtin/describe.c:238
> +#, c-format
> +msgid "Not a valid object name %s"
> +msgstr "Objektnamnet är inte giltigt: %s"
> +
> +#: builtin/describe.c:241
> +#, c-format
> +msgid "%s is not a valid '%s' object"
> +msgstr "%s är inte ett giltigt \"%s\"-objekt"
> +
> +#: builtin/describe.c:258
> +#, c-format
> +msgid "no tag exactly matches '%s'"
> +msgstr "ingen tagg motsvarar \"%s\" exakt"
> +
> +#: builtin/describe.c:260
> +#, c-format
> +msgid "searching to describe %s\n"
> +msgstr "söker för att beskriva %s\n"
> +
> +#: builtin/describe.c:295
> +#, c-format
> +msgid "finished search at %s\n"
> +msgstr "avslutade sökning på %s\n"
> +
> +#: builtin/describe.c:319
> +#, c-format
> +msgid ""
> +"No annotated tags can describe '%s'.\n"
> +"However, there were unannotated tags: try --tags."
> +msgstr ""
> +"Inga dekorerade taggar kan beskriva \"%s\".\n"
> +"Det finns dock odekorerade taggar: testa --tags."
> +
> +#: builtin/describe.c:323
> +#, c-format
> +msgid ""
> +"No tags can describe '%s'.\n"
> +"Try --always, or create some tags."
> +msgstr ""
> +"Inga taggar kan beskriva \"%s\".\n"
> +"Testa --always, eller skapa några taggar."
> +
> +#: builtin/describe.c:344
> +#, c-format
> +msgid "traversed %lu commits\n"
> +msgstr "traverserade %lu incheckningar\n"
> +
> +#: builtin/describe.c:347
> +#, c-format
> +msgid ""
> +"more than %i tags found; listed %i most recent\n"
> +"gave up search at %s\n"
> +msgstr ""
> +"mer än %i taggar hittades; listar de %i senaste\n"
> +"gav upp sökningen vid %s\n"
> +
> +#: builtin/describe.c:398
> +msgid "--long is incompatible with --abbrev=0"
> +msgstr "--long är inkompatibel med --abbrev=0"
> +
> +#: builtin/describe.c:423
> +msgid "No names found, cannot describe anything."
> +msgstr "Inga namn hittades, kan inte beskriva något."
> +
> +#: builtin/describe.c:430
> +msgid "--dirty is incompatible with committishes"
> +msgstr "--dirty är inkompatibelt med \"committish\"-värden"
> +
> +#: builtin/diff.c:76
> +#, c-format
> +msgid "'%s': not a regular file or symlink"
> +msgstr "\"%s\": inte en normal fil eller symbolisk länk"
> +
> +#: builtin/diff.c:225
> +#, c-format
> +msgid "invalid option: %s"
> +msgstr "ogiltig flagga: %s"
> +
> +#: builtin/diff.c:302
> +msgid "Not a git repository"
> +msgstr "Inte ett git-arkiv"
> +
> +#: builtin/diff.c:334
> +msgid "No HEAD commit to compare with (yet)"
> +msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"
> +
> +#: builtin/diff.c:349
> +#, c-format
> +msgid "invalid object '%s' given."
> +msgstr "objektet \"%s\" som angavs är felaktigt."
> +
> +#: builtin/diff.c:354
> +#, c-format
> +msgid "more than %d trees given: '%s'"
> +msgstr "mer än %d träd angavs: \"%s\""
> +
> +#: builtin/diff.c:364
> +#, c-format
> +msgid "more than two blobs given: '%s'"
> +msgstr "mer än två blobbar angavs: \"%s\""
> +
> +#: builtin/diff.c:372
> +#, c-format
> +msgid "unhandled object '%s' given."
> +msgstr "ej hanterat objekt \"%s\" angavs."
> +
> +#: builtin/fetch.c:172
> +msgid "Couldn't find remote ref HEAD"
> +msgstr "Kunde inte hitta fjärr-referensen HEAD"
> +
> +#: builtin/fetch.c:225
> +#, c-format
> +msgid "object %s not found"
> +msgstr "objektet %s hittades inte"
> +
> +#: builtin/fetch.c:230
> +msgid "[up to date]"
> +msgstr "[àjour]"
> +
> +#.
> +#. * If this is the head, and it's not okay to update
> +#. * the head, and the old value of the head isn't empty...
> +#.
> +#: builtin/fetch.c:243
> +#, 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:244 builtin/fetch.c:306
> +msgid "[rejected]"
> +msgstr "[refuserad]"
> +
> +#: builtin/fetch.c:254
> +msgid "[tag update]"
> +msgstr "[uppdaterad tagg]"
> +
> +#: builtin/fetch.c:255 builtin/fetch.c:277 builtin/fetch.c:290
> +msgid " (unable to update local ref)"
> +msgstr " (kunde inte uppdatera lokal ref)"
> +
> +#: builtin/fetch.c:267
> +msgid "[new tag]"
> +msgstr "[ny tagg]"
> +
> +#: builtin/fetch.c:271
> +msgid "[new branch]"
> +msgstr "[ny gren]"
> +
> +#: builtin/fetch.c:302
> +msgid "unable to update local ref"
> +msgstr "kunde inte uppdatera lokal ref"
> +
> +#: builtin/fetch.c:302
> +msgid "forced update"
> +msgstr "tvingad uppdatering"
> +
> +#: builtin/fetch.c:307
> +msgid "(non-fast-forward)"
> +msgstr "(ej snabbspolad)"
> +
> +#: builtin/fetch.c:325 builtin/fetch.c:648
> +#, c-format
> +msgid "cannot open %s: %s\n"
> +msgstr "kan inte öppna %s. %s\n"
> +
> +#: builtin/fetch.c:403
> +#, c-format
> +msgid "From %.*s\n"
> +msgstr "Från %.*s\n"
> +
> +#: builtin/fetch.c:414
> +#, c-format
> +msgid ""
> +"some local refs could not be updated; try running\n"
> +" 'git remote prune %s' to remove any old, conflicting branches"
> +msgstr ""
> +"några 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:464
> +msgid "could not run rev-list"
> +msgstr "kunde inte köra rev-list"
> +
> +#: builtin/fetch.c:478
> +#, c-format
> +msgid "failed write to rev-list: %s"
> +msgstr "kunde inte skriva till rev-list: %s"
> +
> +#: builtin/fetch.c:485
> +#, c-format
> +msgid "failed to close rev-list's stdin: %s"
> +msgstr "kunde inte stänga rev-list:s standard in: %s"
> +
> +#: builtin/fetch.c:512
> +#, c-format
> +msgid " (%s will become dangling)\n"
> +msgstr " (%s kommer bli dinglande)\n"
> +
> +#: builtin/fetch.c:513
> +#, c-format
> +msgid " (%s has become dangling)\n"
> +msgstr " (%s har blivit dinglande)\n"
> +
> +#: builtin/fetch.c:520
> +msgid "[deleted]"
> +msgstr "[borttagen]"
> +
> +#: builtin/fetch.c:521
> +msgid "(none)"
> +msgstr "(ingen)"
> +
> +#: builtin/fetch.c:638
> +#, 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:672
> +#, c-format
> +msgid "Don't know how to fetch from %s"
> +msgstr "Vet inte hur man hämtar från %s"
> +
> +#: builtin/fetch.c:726
> +#, 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:729
> +#, c-format
> +msgid "Option \"%s\" is ignored for %s\n"
> +msgstr "Flaggan \"%s\" ignoreras för %s\n"
> +
> +#: builtin/fetch.c:818
> +#, c-format
> +msgid "Fetching %s\n"
> +msgstr "Hämtar %s\n"
> +
> +#: builtin/fetch.c:820
> +#, c-format
> +msgid "Could not fetch %s"
> +msgstr "Kunde inte hämta %s"
> +
> +#: builtin/fetch.c:836
> +msgid ""
> +"No remote repository specified. Please, specify either a URL or a\n"
> +"remote name from which new revisions should be fetched."
> +msgstr ""
> +"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:856
> +msgid "You need to specify a tag name."
> +msgstr "Du måste ange namnet på en tagg."
> +
> +#: builtin/fetch.c:896
> +msgid "fetch --all does not take a repository argument"
> +msgstr "fetch --all tar inte namnet på ett arkiv som argument"
> +
> +#: builtin/fetch.c:898
> +msgid "fetch --all does not make sense with refspecs"
> +msgstr "fetch --all kan inte anges med referensspecifikationer"
> +
> +#: builtin/fetch.c:909
> +#, c-format
> +msgid "No such remote or remote group: %s"
> +msgstr "Fjärren eller fjärrgruppen finns inte: %s"
> +
> +#: builtin/fetch.c:917
> +msgid "Fetching a group and specifying refspecs does not make sense"
> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> +
> +#: builtin/gc.c:63
> +#, c-format
> +msgid "Invalid %s: '%s'"
> +msgstr "Felaktigt %s: \"%s\""
> +
> +#: builtin/gc.c:78
> +msgid "Too many options specified"
> +msgstr "För många flaggor angavs"
> +
> +#: builtin/gc.c:103
> +#, c-format
> +msgid "insanely long object directory %.*s"
> +msgstr "tokigt lång objektkatalog %.*s"
> +
> +#: builtin/gc.c:220
> +#, c-format
> +msgid "Auto packing the repository for optimum performance.\n"
> +msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
> +
> +#: builtin/gc.c:223
> +#, c-format
> +msgid ""
> +"Auto packing the repository for optimum performance. You may also\n"
> +"run \"git gc\" manually. See \"git help gc\" for more information."
> +msgstr ""
> +"Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
> +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information."
> +
> +#: builtin/gc.c:251
> +msgid ""
> +"There are too many unreachable loose objects; run 'git prune' to remove them."
> +msgstr ""
> +"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort dem."
> +
> +#: builtin/grep.c:252
> +#, c-format
> +msgid "grep: failed to create thread: %s"
> +msgstr "grep: misslyckades skapa tråd. %s"
> +
> +#: builtin/grep.c:457
> +#, c-format
> +msgid "'%s': unable to read %s"
> +msgstr "\"%s\" kunde inte läsa %s"
> +
> +#: builtin/grep.c:508
> +#, c-format
> +msgid "'%s': %s"
> +msgstr "\"%s\": %s"
> +
> +#: builtin/grep.c:519
> +#, c-format
> +msgid "'%s': short read %s"
> +msgstr "\"%s\": kort läsning %s"
> +
> +#: builtin/grep.c:581
> +#, c-format
> +msgid "Failed to chdir: %s"
> +msgstr "Kunde inte byta katalog (chdir): %s"
> +
> +#: builtin/grep.c:671 builtin/grep.c:697
> +#, c-format
> +msgid "unable to read tree (%s)"
> +msgstr "kunde inte läsa träd (%s)"
> +
> +#: builtin/grep.c:703
> +#, c-format
> +msgid "unable to grep from object of type %s"
> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> +
> +#: builtin/grep.c:755
> +#, c-format
> +msgid "switch `%c' expects a numerical value"
> +msgstr "flaggan \"%c\" antar ett numeriskt värde"
> +
> +#: builtin/grep.c:771
> +#, c-format
> +msgid "cannot open '%s'"
> +msgstr "kan inte öppna \"%s\""
> +
> +#: builtin/grep.c:1012
> +msgid "no pattern given."
> +msgstr "inget mönster angavs."
> +
> +#: builtin/grep.c:1016
> +msgid "cannot mix --fixed-strings and regexp"
> +msgstr "kan inte blanda --fixed-strings och reguljära uttryck"
> +
> +#: builtin/grep.c:1041
> +#, c-format
> +msgid "bad object %s"
> +msgstr "felaktigt objekt %s"
> +
> +#: builtin/grep.c:1068
> +msgid "--open-files-in-pager only works on the worktree"
> +msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
> +
> +#: builtin/grep.c:1093
> +msgid "--cached cannot be used with --no-index."
> +msgstr "--cached kan inte användas med --no-index."
> +
> +#: builtin/grep.c:1095
> +msgid "--no-index cannot be used with revs."
> +msgstr "--no-index kan inte användas med revisioner."
> +
> +#: builtin/grep.c:1104
> +msgid "both --cached and trees are given."
> +msgstr "både --cached och träd angavs."
> +
> +#: builtin/init-db.c:34
> +#, c-format
> +msgid "Could not make %s writable by group"
> +msgstr "Kunde inte göra %s skrivbar för grubben"
> +
> +#: builtin/init-db.c:61
> +#, c-format
> +msgid "insanely long template name %s"
> +msgstr "tokigt långt namn på mallen %s"
> +
> +#: builtin/init-db.c:66
> +#, c-format
> +msgid "cannot stat '%s'"
> +msgstr "kan inte ta status på \"%s\""
> +
> +#: builtin/init-db.c:72
> +#, c-format
> +msgid "cannot stat template '%s'"
> +msgstr "kan inte ta status på mallen \"%s\""
> +
> +#: builtin/init-db.c:79
> +#, c-format
> +msgid "cannot opendir '%s'"
> +msgstr "kan inte öppna katalogen (opendir) \"%s\""
> +
> +#: builtin/init-db.c:96
> +#, c-format
> +msgid "cannot readlink '%s'"
> +msgstr "kan inte läsa länk (readlink) \"%s\""
> +
> +#: builtin/init-db.c:98
> +#, c-format
> +msgid "insanely long symlink %s"
> +msgstr "tokigt lång symbolisk länk %s"
> +
> +#: builtin/init-db.c:101
> +#, c-format
> +msgid "cannot symlink '%s' '%s'"
> +msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
> +
> +#: builtin/init-db.c:105
> +#, c-format
> +msgid "cannot copy '%s' to '%s'"
> +msgstr "kan inte kopiera \"%s\" till \"%s\""
> +
> +#: builtin/init-db.c:109
> +#, c-format
> +msgid "ignoring template %s"
> +msgstr "ignorerar mallen %s"
> +
> +#: builtin/init-db.c:132
> +#, c-format
> +msgid "insanely long template path %s"
> +msgstr "tokigt lång mallsökväg %s"
> +
> +#: builtin/init-db.c:140
> +#, c-format
> +msgid "templates not found %s"
> +msgstr "mallarna hittades inte %s"
> +
> +#: builtin/init-db.c:153
> +#, c-format
> +msgid "not copying templates of a wrong format version %d from '%s'"
> +msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
> +
> +#: builtin/init-db.c:191
> +#, c-format
> +msgid "insane git directory %s"
> +msgstr "tokig git-katalog %s"
> +
> +#. TRANSLATORS: The first '%s' is either "Reinitialized
> +#. existing" or "Initialized empty", the second " shared" or
> +#. "", and the last '%s%s' is the verbatim directory name.
> +#: builtin/init-db.c:355
> +#, c-format
> +msgid "%s%s Git repository in %s%s\n"
> +msgstr "%s%s Git-arkiv i %s%s\n"
> +
> +#: builtin/init-db.c:356
> +msgid "Reinitialized existing"
> +msgstr "Ominitierade befintligt"
> +
> +#: builtin/init-db.c:356
> +msgid "Initialized empty"
> +msgstr "Initierade tomt"
> +
> +#: builtin/init-db.c:357
> +msgid " shared"
> +msgstr " delat"
> +
> +#: builtin/init-db.c:376
> +msgid "cannot tell cwd"
> +msgstr "kan inte läsa aktuell katalog (cwd)"
> +
> +#: builtin/init-db.c:450 builtin/init-db.c:457
> +#, c-format
> +msgid "cannot mkdir %s"
> +msgstr "kan inte skapa katalogen (mkdir) %s"
> +
> +#: builtin/init-db.c:461
> +#, c-format
> +msgid "cannot chdir to %s"
> +msgstr "kan inte byta katalog (chdir) till %s"
> +
> +#: builtin/init-db.c:483
> +#, c-format
> +msgid ""
> +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
> +"dir=<directory>)"
> +msgstr ""
> +"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller "
> +"--git-dir=<katalog>)"
> +
> +#: builtin/init-db.c:509
> +msgid "Cannot access current working directory"
> +msgstr "Kan inte komma åt aktuell arbetskatalog"
> +
> +#: builtin/init-db.c:512
> +#, c-format
> +msgid "Cannot access work tree '%s'"
> +msgstr "Kan inte komma åt arbetskatalogen \"%s\""
> +
> +#: builtin/log.c:104
> +#, c-format
> +msgid "invalid --decorate option: %s"
> +msgstr "felaktigt värde till --decorate: %s"
> +
> +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287
> +#, c-format
> +msgid "unrecognized argument: %s"
> +msgstr "okänt argument: %s"
> +
> +#: builtin/log.c:156
> +#, c-format
> +msgid "Final output: %d %s\n"
> +msgstr "Slututdata: %d %s\n"
> +
> +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428
> +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184
> +msgid "revision walk setup failed"
> +msgstr "misslyckades skapa revisionstraversering"
> +
> +#: builtin/log.c:347 builtin/log.c:434
> +#, c-format
> +msgid "Could not read object %s"
> +msgstr "Kunde inte läsa objektet %s"
> +
> +#: builtin/log.c:458
> +#, c-format
> +msgid "Unknown type: %d"
> +msgstr "Okänd typ: %d"
> +
> +#: builtin/log.c:558
> +msgid "format.headers without value"
> +msgstr "format.headers utan värde"
> +
> +#: builtin/log.c:630
> +msgid "name of output directory is too long"
> +msgstr "namn på utdatakatalogen är för lång"
> +
> +#: builtin/log.c:641
> +#, c-format
> +msgid "Cannot open patch file %s"
> +msgstr "Kan inte öppna patchfilen %s"
> +
> +#: builtin/log.c:655
> +msgid "Need exactly one range."
> +msgstr "Behöver precis ett intervall."
> +
> +#: builtin/log.c:663
> +msgid "Not a range."
> +msgstr "Inte ett intervall."
> +
> +#: builtin/log.c:700
> +msgid "Could not extract email from committer identity."
> +msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
> +
> +#: builtin/log.c:732
> +msgid "Cover letter needs email format"
> +msgstr "Omslagsbrevet behöver e-postformat"
> +
> +#: builtin/log.c:825
> +#, c-format
> +msgid "insane in-reply-to: %s"
> +msgstr "tokigt in-reply-to: %s"
> +
> +#: builtin/log.c:898
> +msgid "Two output directories?"
> +msgstr "Två utdatakataloger?"
> +
> +#: builtin/log.c:1087
> +#, c-format
> +msgid "bogus committer info %s"
> +msgstr "felaktig incheckarinformation %s"
> +
> +#: builtin/log.c:1132
> +msgid "-n and -k are mutually exclusive."
> +msgstr "-n och -k kan inte användas samtidigt."
> +
> +#: builtin/log.c:1134
> +msgid "--subject-prefix and -k are mutually exclusive."
> +msgstr "--subject-prefix och -k kan inte användas samtidigt."
> +
> +#: builtin/log.c:1141
> +msgid "--name-only does not make sense"
> +msgstr "kan inte använda --name-only"
> +
> +#: builtin/log.c:1143
> +msgid "--name-status does not make sense"
> +msgstr "kan inte använda --name-status"
> +
> +#: builtin/log.c:1145
> +msgid "--check does not make sense"
> +msgstr "kan inte använda --check"
> +
> +#: builtin/log.c:1166
> +msgid "standard output, or directory, which one?"
> +msgstr "standard ut, eller katalog, vilken skall det vara?"
> +
> +#: builtin/log.c:1168
> +#, c-format
> +msgid "Could not create directory '%s'"
> +msgstr "Kunde inte skapa katalogen \"%s\""
> +
> +#: builtin/log.c:1307
> +msgid "Failed to create output files"
> +msgstr "Misslyckades skapa utdatafiler"
> +
> +#: builtin/log.c:1394
> +#, c-format
> +msgid ""
> +"Could not find a tracked remote branch, please specify <upstream> manually.\n"
> +msgstr ""
> +"Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
> +
> +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424
> +#, c-format
> +msgid "Unknown commit %s"
> +msgstr "Okänd incheckning %s"
> +
> +#: builtin/merge.c:82
> +msgid "switch `m' requires a value"
> +msgstr "flaggan \"m\" behöver ett värde"
> +
> +#: builtin/merge.c:119
> +#, c-format
> +msgid "Could not find merge strategy '%s'.\n"
> +msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
> +
> +#: builtin/merge.c:120
> +#, c-format
> +msgid "Available strategies are:"
> +msgstr "Tillgängliga strategier är:"
> +
> +#: builtin/merge.c:125
> +#, c-format
> +msgid "Available custom strategies are:"
> +msgstr "Tillgängliga skräddarsydda strategier är:"
> +
> +#: builtin/merge.c:223
> +msgid "could not run stash."
> +msgstr "kunde köra stash."
> +
> +#: builtin/merge.c:228
> +msgid "stash failed"
> +msgstr "stash misslyckades"
> +
> +#: builtin/merge.c:233
> +#, c-format
> +msgid "not a valid object: %s"
> +msgstr "inte ett giltigt objekt: %s"
> +
> +#: builtin/merge.c:250
> +msgid "read-tree failed"
> +msgstr "read-tree misslyckades"
> +
> +#: builtin/merge.c:279
> +msgid " (nothing to squash)"
> +msgstr " (inget att platta till)"
> +
> +#: builtin/merge.c:292
> +#, c-format
> +msgid "Squash commit -- not updating HEAD\n"
> +msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
> +
> +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299
> +#: builtin/merge.c:1309
> +#, c-format
> +msgid "Could not write to '%s'"
> +msgstr "Kunde inte skriva till \"%s\""
> +
> +#: builtin/merge.c:323
> +msgid "Writing SQUASH_MSG"
> +msgstr "Skriver SQUASH_MSG"
> +
> +#: builtin/merge.c:325
> +msgid "Finishing SQUASH_MSG"
> +msgstr "Avslutar SQUASH_MSG"
> +
> +#: builtin/merge.c:345
> +#, c-format
> +msgid "No merge message -- not updating HEAD\n"
> +msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
> +
> +#: builtin/merge.c:396
> +#, c-format
> +msgid "'%s' does not point to a commit"
> +msgstr "\"%s\" verkar inte peka på en incheckning"
> +
> +#: builtin/merge.c:491
> +#, c-format
> +msgid "Bad branch.%s.mergeoptions string: %s"
> +msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
> +
> +#: builtin/merge.c:553
> +msgid "git write-tree failed to write a tree"
> +msgstr "git write--tree misslyckades skriva ett träd"
> +
> +#: builtin/merge.c:594
> +msgid "failed to read the cache"
> +msgstr "misslyckads läsa cachen"
> +
> +#: builtin/merge.c:611
> +msgid "Unable to write index."
> +msgstr "Kunde inte skriva indexet."
> +
> +#: builtin/merge.c:624
> +msgid "Not handling anything other than two heads merge."
> +msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
> +
> +#: builtin/merge.c:651
> +#, c-format
> +msgid "Unknown option for merge-recursive: -X%s"
> +msgstr "Felaktig flagga för merge-recursive: -X%s"
> +
> +#: builtin/merge.c:666
> +#, c-format
> +msgid "unable to write %s"
> +msgstr "kunde inte skriva %s"
> +
> +#: builtin/merge.c:791
> +#, c-format
> +msgid "Wonderful.\n"
> +msgstr "Underbart.\n"
> +
> +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295
> +#: builtin/merge.c:1303
> +#, c-format
> +msgid "Could not open '%s' for writing"
> +msgstr "Kunde inte öppna \"%s\" för skrivning"
> +
> +#: builtin/merge.c:856
> +#, c-format
> +msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
> +msgstr "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
> +
> +#: builtin/merge.c:871
> +#, c-format
> +msgid "'%s' is not a commit"
> +msgstr "\"%s\" är inte en incheckning"
> +
> +#: builtin/merge.c:921
> +msgid ""
> +"You have not concluded your merge (MERGE_HEAD exists).\n"
> +"Please, commit your changes before you can merge."
> +msgstr ""
> +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
> +"Checka in dina ändringar innan du kan slå ihop."
> +
> +#: builtin/merge.c:924
> +msgid "You have not concluded your merge (MERGE_HEAD exists)."
> +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
> +
> +#: builtin/merge.c:951
> +msgid "You cannot combine --squash with --no-ff."
> +msgstr "Du kan inte kombinera --squash med --no-ff."
> +
> +#: builtin/merge.c:956
> +msgid "You cannot combine --no-ff with --ff-only."
> +msgstr "Du kan inte kombinera --no-ff med --ff-only."
> +
> +#: builtin/merge.c:984
> +msgid "Can merge only exactly one commit into empty head"
> +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
> +
> +#: builtin/merge.c:987
> +msgid "Squash commit into empty head not supported yet"
> +msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
> +
> +#: builtin/merge.c:989
> +msgid "Non-fast-forward commit does not make sense into an empty head"
> +msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
> +
> +#: builtin/merge.c:993 builtin/merge.c:1041
> +#, c-format
> +msgid "%s - not something we can merge"
> +msgstr "%s - inte något vi kan slå ihop"
> +
> +#: builtin/merge.c:1099
> +#, c-format
> +msgid "Updating %s..%s\n"
> +msgstr "Uppdaterar %s..%s\n"
> +
> +#: builtin/merge.c:1133
> +#, c-format
> +msgid "Trying really trivial in-index merge...\n"
> +msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
> +
> +#: builtin/merge.c:1137
> +#, c-format
> +msgid "Nope.\n"
> +msgstr "Nej.\n"
> +
> +#: builtin/merge.c:1170
> +msgid "Not possible to fast-forward, aborting."
> +msgstr "Kan inte snabbspola, avbryter."
> +
> +#: builtin/merge.c:1196 builtin/merge.c:1269
> +#, c-format
> +msgid "Rewinding the tree to pristine...\n"
> +msgstr "Återspolar trädet till ofördärvat...\n"
> +
> +#: builtin/merge.c:1200
> +#, c-format
> +msgid "Trying merge strategy %s...\n"
> +msgstr "Försöker sammanslagninsstrategin %s...\n"
> +
> +#: builtin/merge.c:1261
> +#, c-format
> +msgid "No merge strategy handled the merge.\n"
> +msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
> +
> +#: builtin/merge.c:1263
> +#, c-format
> +msgid "Merge with strategy %s failed.\n"
> +msgstr "Sammanslaning med strategin %s misslyckades.\n"
> +
> +#: builtin/merge.c:1271
> +#, c-format
> +msgid "Using the %s to prepare resolving by hand.\n"
> +msgstr "Använder %s för att förbereda lösning för hand.\n"
> +
> +#: builtin/merge.c:1314
> +#, c-format
> +msgid "Automatic merge went well; stopped before committing as requested\n"
> +msgstr "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
> +
> +#: builtin/mv.c:103
> +#, c-format
> +msgid "Checking rename of '%s' to '%s'\n"
> +msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
> +
> +#: builtin/mv.c:107
> +msgid "bad source"
> +msgstr "felaktig källa"
> +
> +#: builtin/mv.c:110
> +msgid "can not move directory into itself"
> +msgstr "kan inte flytta katalog till sig själv"
> +
> +#: builtin/mv.c:113
> +msgid "cannot move directory over file"
> +msgstr "kan inte flytta katalog över fil"
> +
> +#: builtin/mv.c:123
> +#, c-format
> +msgid "Huh? %.*s is in index?"
> +msgstr "Vad? %.*s är i indexet?"
> +
> +#: builtin/mv.c:135
> +msgid "source directory is empty"
> +msgstr "källkatalogen är tom"
> +
> +#: builtin/mv.c:166
> +msgid "not under version control"
> +msgstr "inte versionshanterad"
> +
> +#: builtin/mv.c:168
> +msgid "destination exists"
> +msgstr "destinationen finns"
> +
> +#: builtin/mv.c:175
> +#, c-format
> +msgid "%s; will overwrite!"
> +msgstr "%s; kommer skriva över!"
> +
> +#: builtin/mv.c:178
> +msgid "Cannot overwrite"
> +msgstr "Kan inte skriva över"
> +
> +#: builtin/mv.c:181
> +msgid "multiple sources for the same target"
> +msgstr "flera källor för samma mål"
> +
> +#: builtin/mv.c:196
> +#, c-format
> +msgid "%s, source=%s, destination=%s"
> +msgstr "%s, källa=%s, mål=%s"
> +
> +#: builtin/mv.c:206
> +#, c-format
> +msgid "Renaming %s to %s\n"
> +msgstr "Byter namn på %s till %s\n"
> +
> +#: builtin/mv.c:209
> +#, c-format
> +msgid "renaming '%s' failed"
> +msgstr "misslyckades byta namn på \"%s\""
> +
> +#: builtin/notes.c:122
> +#, c-format
> +msgid "unable to start 'show' for object '%s'"
> +msgstr "kunde int estarta \"show\" för objektet \"%s\""
> +
> +#: builtin/notes.c:128
> +msgid "can't fdopen 'show' output fd"
> +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"
> +
> +#: builtin/notes.c:138
> +#, c-format
> +msgid "failed to close pipe to 'show' for object '%s'"
> +msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""
> +
> +#: builtin/notes.c:141
> +#, c-format
> +msgid "failed to finish 'show' for object '%s'"
> +msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
> +
> +#: builtin/notes.c:158 builtin/tag.c:311
> +#, c-format
> +msgid "could not create file '%s'"
> +msgstr "kunde inte skapa filen \"%s\""
> +
> +#: builtin/notes.c:172
> +msgid "Please supply the note contents using either -m or -F option"
> +msgstr "Ange innehåll för anteckningen med antingen -m eller -F"
> +
> +#: builtin/notes.c:193 builtin/notes.c:797
> +#, c-format
> +msgid "Removing note for object %s\n"
> +msgstr "Tar bort anteckning för objektet %s\n"
> +
> +#: builtin/notes.c:198
> +msgid "unable to write note object"
> +msgstr "kunde inte skriva anteckningsobjekt"
> +
> +#: builtin/notes.c:200
> +#, c-format
> +msgid "The note contents has been left in %s"
> +msgstr "Anteckningens innehåll har lämnats kvar i %s"
> +
> +#: builtin/notes.c:234 builtin/tag.c:445
> +#, c-format
> +msgid "cannot read '%s'"
> +msgstr "kunde inte läsa \"%s\""
> +
> +#: builtin/notes.c:236 builtin/tag.c:448
> +#, c-format
> +msgid "could not open or read '%s'"
> +msgstr "kunde inte öppna eller läsa \"%s\""
> +
> +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446
> +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631
> +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752
> +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461
> +#, c-format
> +msgid "Failed to resolve '%s' as a valid ref."
> +msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
> +
> +#: builtin/notes.c:258
> +#, c-format
> +msgid "Failed to read object '%s'."
> +msgstr "Kunde inte läsa objektet \"%s\"."
> +
> +#: builtin/notes.c:283
> +msgid "Cannot commit uninitialized/unreferenced notes tree"
> +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
> +
> +#: builtin/notes.c:295
> +msgid "Failed to write current notes tree to database"
> +msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen"
> +
> +#: builtin/notes.c:307
> +msgid "Failed to commit notes tree to database"
> +msgstr "Kunde inte checka in anteckningsträd i databasen"
> +
> +#: builtin/notes.c:339
> +#, c-format
> +msgid "Bad notes.rewriteMode value: '%s'"
> +msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
> +
> +#: builtin/notes.c:349
> +#, c-format
> +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
> +msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
> +
> +#. TRANSLATORS: The first %s is the name of the
> +#. environment variable, the second %s is its value
> +#: builtin/notes.c:376
> +#, c-format
> +msgid "Bad %s value: '%s'"
> +msgstr "Felaktigt värde på %s: \"%s\""
> +
> +#: builtin/notes.c:440
> +#, c-format
> +msgid "Malformed input line: '%s'."
> +msgstr "Felaktig indatarad: \"%s\"."
> +
> +#: builtin/notes.c:455
> +#, c-format
> +msgid "Failed to copy notes from '%s' to '%s'"
> +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
> +
> +# FIXME: Untranslatable!
> +#. TRANSLATORS: The first %s is one of "git notes ACTION",
> +#. e.g. "add", "copy", "append" etc.
> +#: builtin/notes.c:481
> +#, c-format
> +#
> +msgid "Refusing to %s notes in %s (outside of refs/notes/)"
> +msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)"
> +
> +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614
> +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745
> +#: builtin/notes.c:782 builtin/notes.c:821
> +msgid "too many parameters"
> +msgstr "för många parametrar"
> +
> +#: builtin/notes.c:505
> +msgid "list"
> +msgstr "list"
> +
> +#: builtin/notes.c:514 builtin/notes.c:758
> +#, c-format
> +msgid "No note found for object %s."
> +msgstr "Inga anteckningar hittades för objektet %s."
> +
> +#: builtin/notes.c:567
> +#, c-format
> +msgid ""
> +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
> +"existing notes"
> +msgstr ""
> +"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
> +"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
> +
> +#: builtin/notes.c:572 builtin/notes.c:649
> +#, c-format
> +msgid "Overwriting existing notes for object %s\n"
> +msgstr "Skriver över befintliga anteckningar för objektet %s\n"
> +
> +#: builtin/notes.c:622
> +msgid "too few parameters"
> +msgstr "för få parametrar"
> +
> +#: builtin/notes.c:638
> +msgid "copy"
> +msgstr "copy"
> +
> +#: builtin/notes.c:643
> +#, c-format
> +msgid ""
> +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
> +"existing notes"
> +msgstr ""
> +"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
> +"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
> +
> +#: builtin/notes.c:655
> +#, c-format
> +msgid "Missing notes on source object %s. Cannot copy."
> +msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
> +
> +#: builtin/notes.c:703
> +#, c-format
> +msgid ""
> +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
> +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
> +msgstr ""
> +"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
> +"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
> +
> +#: builtin/notes.c:754
> +msgid "show"
> +msgstr "show"
> +
> +#: builtin/notes.c:791
> +msgid "remove"
> +msgstr "remove"
> +
> +#: builtin/notes.c:795
> +#, c-format
> +msgid "Object %s has no note\n"
> +msgstr "Objektet %s har ingen anteckning\n"
> +
> +#: builtin/notes.c:825
> +msgid "prune"
> +msgstr "prune"
> +
> +#: builtin/notes.c:877
> +#, c-format
> +msgid "Unknown subcommand: %s"
> +msgstr "Okänt underkommando: %s"
> +
> +#: builtin/push.c:43
> +msgid "tag shorthand without <tag>"
> +msgstr "taggförkortning utan <tagg>"
> +
> +#: builtin/push.c:62
> +msgid "--delete only accepts plain target ref names"
> +msgstr "--delete godtar endast enkla målreferensnamn"
> +
> +#: builtin/push.c:72
> +msgid "You are not currently on a branch."
> +msgstr "Du är inte på någon gren för närvarande."
> +
> +#: builtin/push.c:74
> +#, c-format
> +msgid "The current branch %s is not tracking anything."
> +msgstr "Den aktuella grenen %s spårar ingenting."
> +
> +#: builtin/push.c:77
> +#, c-format
> +msgid "The current branch %s is tracking multiple branches, refusing to push."
> +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."
> +
> +#: builtin/push.c:100
> +msgid ""
> +"You didn't specify any refspecs to push, and push.default is \"nothing\"."
> +msgstr ""
> +"Du angav inga referensspecifikationer att sända, och push.default är \"nothing\"."
> +
> +#: builtin/push.c:120
> +#, c-format
> +msgid "Pushing to %s\n"
> +msgstr "Sänder till %s\n"
> +
> +#: builtin/push.c:124
> +#, c-format
> +msgid "failed to push some refs to '%s'"
> +msgstr "misslyckades sända några referenser till \"%s\""
> +
> +#: builtin/push.c:132
> +#, c-format
> +msgid ""
> +"To prevent you from losing history, non-fast-forward updates were rejected\n"
> +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
> +"'Note about fast-forwards' section of 'git push --help' for details.\n"
> +msgstr ""
> +"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n"
> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n"
> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n"
> +
> +#: builtin/push.c:149
> +#, c-format
> +msgid "bad repository '%s'"
> +msgstr "felaktigt arkiv \"%s\""
> +
> +#: builtin/push.c:150
> +msgid "No destination configured to push to."
> +msgstr "Har inte ställt in någon destination att sända till."
> +
> +#: builtin/push.c:158
> +msgid "--all and --tags are incompatible"
> +msgstr "--all och --tags är inkompatibla"
> +
> +#: builtin/push.c:159
> +msgid "--all can't be combined with refspecs"
> +msgstr "--all kan inte kombineras med referensspecifikationer"
> +
> +#: builtin/push.c:164
> +msgid "--mirror and --tags are incompatible"
> +msgstr "--mirror och --tags är inkompatibla"
> +
> +#: builtin/push.c:165
> +msgid "--mirror can't be combined with refspecs"
> +msgstr "--mirror kan inte kombineras med referensspecifikationer"
> +
> +#: builtin/push.c:170
> +msgid "--all and --mirror are incompatible"
> +msgstr "--all och --mirror är inkompatibla"
> +
> +#: builtin/push.c:235
> +msgid "--delete is incompatible with --all, --mirror and --tags"
> +msgstr "--delete är imkompatibel med --all, --mirror och --tags"
> +
> +#: builtin/push.c:237
> +msgid "--delete doesn't make sense without any refs"
> +msgstr "--delete kan inte användas utan referenser"
> +
> +#: builtin/reset.c:33
> +msgid "mixed"
> +msgstr "blandad"
> +
> +#: builtin/reset.c:33
> +msgid "soft"
> +msgstr "mjuk"
> +
> +#: builtin/reset.c:33
> +msgid "hard"
> +msgstr "hård"
> +
> +#: builtin/reset.c:33
> +msgid "merge"
> +msgstr "sammanslagning"
> +
> +#: builtin/reset.c:33
> +msgid "keep"
> +msgstr "behåll"
> +
> +#: builtin/reset.c:95
> +msgid "You do not have a valid HEAD."
> +msgstr "Du har inte en giltig HEAD."
> +
> +#: builtin/reset.c:97
> +msgid "Failed to find tree of HEAD."
> +msgstr "Kunde inte hitta träder för HEAD."
> +
> +#: builtin/reset.c:103
> +#, c-format
> +msgid "Failed to find tree of %s."
> +msgstr "Kunde inte hitta träder för %s."
> +
> +#: builtin/reset.c:108
> +msgid "Could not write new index file."
> +msgstr "Kunde inte skriva ny indexfil."
> +
> +#: builtin/reset.c:118
> +#, c-format
> +msgid "HEAD is now at %s"
> +msgstr "HEAD är nu på %s"
> +
> +#: builtin/reset.c:142
> +msgid "Could not read index"
> +msgstr "Kunde inte läsa indexet"
> +
> +#: builtin/reset.c:145
> +msgid "Unstaged changes after reset:"
> +msgstr "Oköade ändringar efter återställning:"
> +
> +#: builtin/reset.c:225
> +#, c-format
> +msgid "Reflog action message too long: %.*s..."
> +msgstr "Reflog-händelsemeddelande för långt: %.*s..."
> +
> +#: builtin/reset.c:231
> +#, c-format
> +msgid "Cannot do a %s reset in the middle of a merge."
> +msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
> +
> +#: builtin/reset.c:307
> +#, c-format
> +msgid "Could not parse object '%s'."
> +msgstr "Kan inte tolka objektet \"%s\""
> +
> +#: builtin/reset.c:312
> +msgid "--patch is incompatible with --{hard,mixed,soft}"
> +msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
> +
> +#: builtin/reset.c:321
> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
> +
> +#: builtin/reset.c:323
> +#, c-format
> +msgid "Cannot do %s reset with paths."
> +msgstr "Kan inte göra %s återställning med sökvägar."
> +
> +#: builtin/reset.c:335
> +#, c-format
> +msgid "%s reset is not allowed in a bare repository"
> +msgstr "%s återställning tillåts inte i ett naket arkiv"
> +
> +#: builtin/reset.c:351
> +#, c-format
> +msgid "Could not reset index file to revision '%s'."
> +msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
> +
> +#: builtin/revert.c:82
> +msgid "program error"
> +msgstr "programfel"
> +
> +#: builtin/revert.c:154 builtin/revert.c:188
> +#, c-format
> +msgid "Could not read commit message of %s"
> +msgstr "Kunde inte läsa incheckningsmeddelandet för %s"
> +
> +#: builtin/revert.c:202
> +#, c-format
> +msgid "Could not extract author email from %s"
> +msgstr "Kunde inte hämta författarens e-postadress från %s"
> +
> +#: builtin/revert.c:214
> +#, c-format
> +msgid "Could not extract author time from %s"
> +msgstr "Kunde inte hämta författartid från %s"
> +
> +#: builtin/revert.c:230
> +#, c-format
> +msgid "No author information found in %s"
> +msgstr "Hittade ingen författarinformation i %s"
> +
> +#: builtin/revert.c:267
> +#, c-format
> +msgid "Could not write to %s."
> +msgstr "Kunde inte skriva till %s."
> +
> +#: builtin/revert.c:270
> +#, c-format
> +msgid "Error wrapping up %s"
> +msgstr "Fel vid ombrytning av %s"
> +
> +#: builtin/revert.c:290
> +msgid ""
> +"Your local changes would be overwritten by revert.\n"
> +"Please, commit your changes or stash them to proceed."
> +msgstr ""
> +"Dina lokala ändringar skulle skrivas över av \"revert\".\n"
> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
> +
> +#: builtin/revert.c:293
> +msgid ""
> +"Your local changes would be overwritten by cherry-pick.\n"
> +"Please, commit your changes or stash them to proceed."
> +msgstr ""
> +"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n"
> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
> +
> +#. TRANSLATORS: %s will be "revert" or "cherry-pick"
> +#: builtin/revert.c:351
> +#, c-format
> +msgid "%s: Unable to write new index file"
> +msgstr "%s: Kunde inte skriva ny indexfil"
> +
> +#: builtin/revert.c:417
> +msgid "Your index file is unmerged."
> +msgstr "Din indexfil har inte slagits ihop."
> +
> +#: builtin/revert.c:420
> +msgid "You do not have a valid HEAD"
> +msgstr "Du har ingen giltig HEAD"
> +
> +#: builtin/revert.c:428
> +msgid "Cannot revert a root commit"
> +msgstr "Kan inte ångra en rotincheckning"
> +
> +#: builtin/revert.c:437
> +#, 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."
> +
> +#: builtin/revert.c:445
> +#, c-format
> +msgid "Commit %s does not have parent %d"
> +msgstr "Incheckning %s har inte förälder %d"
> +
> +#: builtin/revert.c:449
> +#, 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
> +#: builtin/revert.c:460
> +#, c-format
> +msgid "%s: cannot parse parent commit %s"
> +msgstr "%s: kan inte tolka föräldraincheckningen %s"
> +
> +#: builtin/revert.c:464
> +#, c-format
> +msgid "Cannot get commit message for %s"
> +msgstr "Kan inte hämta incheckningsmeddelande för %s"
> +
> +#: builtin/revert.c:525
> +#, c-format
> +msgid "could not revert %s... %s"
> +msgstr "kunde inte ångra %s... %s"
> +
> +#: builtin/revert.c:526
> +#, c-format
> +msgid "could not apply %s... %s"
> +msgstr "kunde inte applicera %s... %s"
> +
> +#: builtin/revert.c:559
> +msgid "empty commit set passed"
> +msgstr "den angivna uppsättningen incheckningar är tom"
> +
> +#: builtin/revert.c:573
> +msgid "cherry-pick --ff cannot be used with --signoff"
> +msgstr "cherry-pick --ff kan inte användas med --signoff"
> +
> +#: builtin/revert.c:575
> +msgid "cherry-pick --ff cannot be used with --no-commit"
> +msgstr "cherry-pick --ff kan inte användas med --no-commit"
> +
> +#: builtin/revert.c:577
> +msgid "cherry-pick --ff cannot be used with -x"
> +msgstr "cherry-pick --ff kan inte användas med -x"
> +
> +#: builtin/revert.c:579
> +msgid "cherry-pick --ff cannot be used with --edit"
> +msgstr "cherry-pick --ff kan inte användas med --edit"
> +
> +#. TRANSLATORS: %s will be "revert" or "cherry-pick"
> +#: builtin/revert.c:584
> +#, c-format
> +msgid "git %s: failed to read the index"
> +msgstr "git %s: misslyckades läsa indexet"
> +
> +#: builtin/rm.c:118
> +#, c-format
> +msgid ""
> +"'%s' has staged content different from both the file and the HEAD\n"
> +"(use -f to force removal)"
> +msgstr ""
> +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"
> +"(använd -f för att tvinga borttagning)"
> +
> +#: builtin/rm.c:124
> +#, c-format
> +msgid ""
> +"'%s' has changes staged in the index\n"
> +"(use --cached to keep the file, or -f to force removal)"
> +msgstr ""
> +"\"%s\" har köade ändringar i indexet\n"
> +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
> +
> +#: builtin/rm.c:128
> +#, c-format
> +msgid ""
> +"'%s' has local modifications\n"
> +"(use --cached to keep the file, or -f to force removal)"
> +msgstr ""
> +"\"%s\" har lokala ändringar\n"
> +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
> +
> +#: builtin/rm.c:202
> +#, c-format
> +msgid "not removing '%s' recursively without -r"
> +msgstr "tar inte bort \"%s\" rekursivt utan -r"
> +
> +#: builtin/rm.c:238
> +#, c-format
> +msgid "git rm: unable to remove %s"
> +msgstr "git rm: kan inte ta bort %s"
> +
> +#: builtin/shortlog.c:161
> +#, c-format
> +msgid "Missing author: %s"
> +msgstr "Saknad författare: %s"
> +
> +#: builtin/tag.c:123 builtin/tag.c:464
> +#, c-format
> +msgid "tag name too long: %.*s..."
> +msgstr "taggnamnet för långt: %.*s..."
> +
> +#: builtin/tag.c:128
> +#, c-format
> +msgid "tag '%s' not found."
> +msgstr "taggen \"%s\" hittades inte."
> +
> +#: builtin/tag.c:143
> +#, c-format
> +msgid "Deleted tag '%s' (was %s)\n"
> +msgstr "Tog bort tagg \"%s\" (var %s)\n"
> +
> +#: builtin/tag.c:155
> +#, c-format
> +msgid "could not verify the tag '%s'"
> +msgstr "kunde inte bekräfta taggen \"%s\""
> +
> +#: builtin/tag.c:170
> +msgid "committer info too long."
> +msgstr "incheckarinformation för lång."
> +
> +#: builtin/tag.c:190
> +msgid "could not run gpg."
> +msgstr "kunde inte köra gpg."
> +
> +#: builtin/tag.c:196
> +msgid "gpg did not accept the tag data"
> +msgstr "gpg godtog inte taggdata"
> +
> +#: builtin/tag.c:203
> +msgid "gpg failed to sign the tag"
> +msgstr "gpg misslyckades signera taggen"
> +
> +#: builtin/tag.c:218
> +msgid ""
> +"\n"
> +"#\n"
> +"# Write a tag message\n"
> +"#\n"
> +msgstr ""
> +"\n"
> +"#\n"
> +"# Skriv ett taggmeddelande\n"
> +"#\n"
> +
> +#: builtin/tag.c:226
> +#, c-format
> +msgid "signing key value too long (%.10s...)"
> +msgstr "signeringsnyckelvärdet för långt (%.10s...)"
> +
> +#: builtin/tag.c:272
> +msgid "unable to sign the tag"
> +msgstr "kunde inte signera taggen"
> +
> +#: builtin/tag.c:274
> +msgid "unable to write tag file"
> +msgstr "kunde inte skriva tagg-filen"
> +
> +#: builtin/tag.c:289
> +msgid "bad object type."
> +msgstr "felaktig objekttyp"
> +
> +#: builtin/tag.c:302
> +msgid "tag header too big."
> +msgstr "tagghuvud för stort."
> +
> +#: builtin/tag.c:329
> +msgid "no tag message?"
> +msgstr "inget taggmeddelande?"
> +
> +#: builtin/tag.c:335
> +#, c-format
> +msgid "The tag message has been left in %s\n"
> +msgstr "Taggmeddelandet har lämnats i %s\n"
> +
> +#: builtin/tag.c:428
> +msgid "-n option is only allowed with -l."
> +msgstr "Flaggan -n är endast tillåten tillsammans med -l."
> +
> +#: builtin/tag.c:430
> +msgid "--contains option is only allowed with -l."
> +msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
> +
> +#: builtin/tag.c:438
> +msgid "only one -F or -m option is allowed."
> +msgstr "endast en av flaggorna -F eller -m tillåts."
> +
> +#: builtin/tag.c:458
> +msgid "too many params"
> +msgstr "för många parametrar"
> +
> +#: builtin/tag.c:466
> +#, c-format
> +msgid "'%s' is not a valid tag name."
> +msgstr "\"%s\" är inte ett giltigt taggnamn."
> +
> +#: builtin/tag.c:471
> +#, c-format
> +msgid "tag '%s' already exists"
> +msgstr "taggen \"%s\" finns redan"
> +
> +#: builtin/tag.c:479
> +#, c-format
> +msgid "%s: cannot lock the ref"
> +msgstr "%s: kan inte låsa referensen"
> +
> +#: builtin/tag.c:481
> +#, c-format
> +msgid "%s: cannot update the ref"
> +msgstr "%s: kan inte uppdatera referensen"
> +
> +#: builtin/tag.c:483
> +#, c-format
> +msgid "Updated tag '%s' (was %s)\n"
> +msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:5
> +msgid "See 'git help COMMAND' for more information on a specific command."
> +msgstr "Se \"git help KOMMANDO\" för mer information om ett specifikt kommando."
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:10
> +msgid "TEST: A C test string"
> +msgstr "TEST: A C test string"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:13
> +#, c-format
> +msgid "TEST: A C test string %s"
> +msgstr "TEST: A C test string %s"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:16
> +#, c-format
> +msgid "TEST: Hello World!"
> +msgstr "TEST: Hello World!"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:19
> +#, c-format
> +msgid "TEST: Old English Runes"
> +msgstr "TEST: Old English Runes"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.c:22
> +#, c-format
> +msgid "TEST: ‘single’ and “double” quotes"
> +msgstr "TEST: ‘single’ and “double” quotes"
> +
> +#: git-am.sh:47
> +msgid "You need to set your committer info first"
> +msgstr "Du måste ställa in din incheckarinformation först"
> +
> +#: git-am.sh:80
> +#, sh-format
> +msgid ""
> +"When you have resolved this problem run \"$cmdline --resolved\".\n"
> +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
> +"To restore the original branch and stop patching run \"$cmdline --abort\"."
> +msgstr ""
> +"När du har löst problemet kör du \"$cmdline --resolved\".\n"
> +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
> +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
> +
> +#: git-am.sh:96
> +msgid "Cannot fall back to three-way merge."
> +msgstr "Kan inte falla tillbaka på trevägssammanslagning."
> +
> +#: git-am.sh:111
> +msgid "Repository lacks necessary blobs to fall back on 3-way merge."
> +msgstr "Arkivet saknar objekt som behövs för att falla tillbaka på 3-vägssammanslagning."
> +
> +#: git-am.sh:120
> +msgid ""
> +"Did you hand edit your patch?\n"
> +"It does not apply to blobs recorded in its index."
> +msgstr ""
> +"Vill du handredigera din patch?\n"
> +"Den kan inte appliceras på blobbar som antecknats i dess index."
> +
> +#: git-am.sh:236
> +msgid "Only one StGIT patch series can be applied at once"
> +msgstr "Endast en StGIT-patchserie kan appliceras åt gången"
> +
> +#: git-am.sh:288
> +#, sh-format
> +msgid "Patch format $patch_format is not supported."
> +msgstr "Patchformatet $patch_format stöds inte."
> +
> +#: git-am.sh:290
> +msgid "Patch format detection failed."
> +msgstr "Misslyckades detektera patchformat."
> +
> +#: git-am.sh:340
> +msgid "-d option is no longer supported. Do not use."
> +msgstr "Flaggan -d stöds inte lägre. Använd inte."
> +
> +#: git-am.sh:403
> +#, sh-format
> +msgid "previous rebase directory $dotest still exists but mbox given."
> +msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs."
> +
> +#: git-am.sh:408
> +msgid "Please make up your mind. --skip or --abort?"
> +msgstr "Bestäm dig. --skip eller --abort?"
> +
> +#: git-am.sh:434
> +msgid "Resolve operation not in progress, we are not resuming."
> +msgstr "Lösningsoperation pågår inte, vi återupptar inte."
> +
> +#: git-am.sh:499
> +#, sh-format
> +msgid "Dirty index: cannot apply patches (dirty: $files)"
> +msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)"
> +
> +#: git-am.sh:595
> +#, sh-format
> +msgid ""
> +"Patch is empty. Was it split wrong?\n"
> +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
> +"To restore the original branch and stop patching run \"$cmdline --abort\"."
> +msgstr ""
> +"Patchen är tom. Delades den upp felaktigt?\n"
> +"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
> +"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
> +
> +#: git-am.sh:632
> +msgid "Patch does not have a valid e-mail address."
> +msgstr "Patchen har inte någon giltig e-postadress."
> +
> +#: git-am.sh:679
> +msgid "cannot be interactive without stdin connected to a terminal."
> +msgstr "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
> +
> +#: git-am.sh:683
> +msgid "Commit Body is:"
> +msgstr "Incheckningskroppen är:"
> +
> +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
> +#. in your translation. The program will only accept English
> +#. input at this point.
> +#: git-am.sh:690
> +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
> +msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "
> +
> +#: git-am.sh:726
> +#, sh-format
> +msgid "Applying: $FIRSTLINE"
> +msgstr "Applicerar: $FIRSTLINE"
> +
> +#: git-am.sh:747
> +msgid ""
> +"No changes - did you forget to use 'git add'?\n"
> +"If there is nothing left to stage, chances are that something else\n"
> +"already introduced the same changes; you might want to skip this patch."
> +msgstr ""
> +"Inga ändrinar - glömde du använda \"git add\"?\n"
> +"Om det inte är något kvar att köa kan det hända att någon annan redan\n"
> +"introducerat samma ändringar; kanske du bör hoppa över patchen."
> +
> +#: git-am.sh:755
> +msgid ""
> +"You still have unmerged paths in your index\n"
> +"did you forget to use 'git add'?"
> +msgstr ""
> +"Du har fortfarande sökvägar som inte slagits samman i ditt index\n"
> +"glömde du använda \"git add\"?"
> +
> +#: git-am.sh:771
> +msgid "No changes -- Patch already applied."
> +msgstr "Inga ändringar -- Patchen har redan applicerats."
> +
> +#: git-am.sh:781
> +#, sh-format
> +msgid "Patch failed at $msgnum $FIRSTLINE"
> +msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
> +
> +#: git-am.sh:797
> +msgid "applying to an empty history"
> +msgstr "applicerar på en tom historik"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.sh:8
> +msgid "TEST: A Shell test string"
> +msgstr "TEST: A Shell test string"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.sh:11
> +#, sh-format
> +msgid "TEST: A Shell test $variable"
> +msgstr "TEST: A Shell test $variable"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.perl:8
> +msgid "TEST: A Perl test string"
> +msgstr "TEST: A Perl test string"
> +
> +#. TRANSLATORS: This is a test. You don't need to translate it.
> +#: t/t0200/test.perl:11
> +#, perl-format
> +msgid "TEST: A Perl test variable %s"
> +msgstr "TEST: A Perl test variable %s"
> +
> --
> 1.7.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-12 23:03 ` Ævar Arnfjörð Bjarmason
@ 2010-09-13 7:15 ` Peter Krefting
2010-09-13 12:47 ` [PATCH] Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease Ævar Arnfjörð Bjarmason
2010-09-13 13:35 ` [PATCH 2/2] Add Swedish translation Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 24+ messages in thread
From: Peter Krefting @ 2010-09-13 7:15 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git
Ævar Arnfjörð Bjarmason:
> * Doesn't follow the "Initializing a .po file" docs in
> t/README. Here's what you get after applying the little Perl
> cleanup program there to it:
Well, I just used the standard commands for creating it.
> @@ -1,54 +1,38 @@
> -# Swedish translation of git
> -# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
> -# Peter Krefting <peter@softwolves.pp.se>, 2010.
> -#
That's a standard header, which is good to keep for clarity. If we want to
go through Translation Project (which I still do recommend), it is required.
> -"PO-Revision-Date: 2010-09-12 21:07+0100\n"
That's a good reference header to see how out-of-date the translation is.
> -"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
> -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
These are standard headers to make it easier to find out who to blame the
translation on. I haven't actually submitted my translation for review on
the Swedish list yet, but will do so soon enough.
> -#: wt-status.c:56
These context lines are invaluable when figuring out how to translate stuff,
and to track back strings after the fact. I do not like the idea of removing
them.
> * Commit message should be "po/sv.po: add Swedish translation". It
> makes it much easier to `git log --grep=po/` or `git log
> --grep=po/sv.po` in the future.
Git has that information already, no need to put it in the commit message :-)
> * You're translating the TEST: messages, it's redundant except for
> Icelandic (which uses it for git.git tests), but I can see how it
> can be painful to have non-100% translation coverage.
I just copied them verbatim, I didn't actually translate them. Without
translating them I can't tell if I've translated everything when doing a
"msgfmt -vvv --check sv.po".
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 2/2] Add Swedish translation.
2010-09-12 20:10 [PATCH 2/2] Add Swedish translation Peter Krefting
2010-09-12 23:03 ` Ævar Arnfjörð Bjarmason
@ 2010-09-13 10:12 ` Peter Kjellerstedt
2010-09-15 10:24 ` Peter Krefting
1 sibling, 1 reply; 24+ messages in thread
From: Peter Kjellerstedt @ 2010-09-13 10:12 UTC (permalink / raw)
To: Peter Krefting, git, avarab
Mainly comments on the Swedish translation below, but there
are a few references to the English messages as well.
> -----Original Message-----
> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
> Behalf Of Peter Krefting
> Sent: den 12 september 2010 22:10
> To: git@vger.kernel.org; avarab@gmail.com
> Subject: [PATCH 2/2] Add Swedish translation.
>
> Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
> ---
> po/sv.po | 2947
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 2947 insertions(+), 0 deletions(-)
> create mode 100644 po/sv.po
>
> diff --git a/po/sv.po b/po/sv.po
> new file mode 100644
> index 0000000..26fa0a6
> --- /dev/null
> +++ b/po/sv.po
> @@ -0,0 +1,2947 @@
> +# Swedish translation of git
> +# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
> +# Peter Krefting <peter@softwolves.pp.se>, 2010.
> +#
> +msgid ""
> +msgstr ""
> +"Project-Id-Version: git 1.7.3\n"
> +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
> +"POT-Creation-Date: 2010-09-10 20:09+0100\n"
> +"PO-Revision-Date: 2010-09-12 21:07+0100\n"
> +"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
> +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
> +"MIME-Version: 1.0\n"
> +"Content-Type: text/plain; charset=UTF-8\n"
> +"Content-Transfer-Encoding: 8bit\n"
> +"Plural-Forms: nplurals=2; plural=(n != 1);"
[cut]
> +#: wt-status.c:100
> +msgid "# (commit or discard the untracked or modified content in submodules)"
> +msgstr "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
Wouldn't "följa" be a better translation than "spåra" for "track"?
[cut]
> +#: builtin/add.c:41
> +#, c-format
> +msgid "unexpected diff status %c"
> +msgstr "diff-status %c förväntades inte"
"oväntad diff-status %c" ?
> +
> +#: builtin/add.c:67 builtin/commit.c:244
> +msgid "updating files failed"
> +msgstr "misslyckades uppdatera filer"
> +
> +#: builtin/add.c:77
> +#, c-format
> +msgid "remove '%s'\n"
> +msgstr "ta bort \"%s\"\n"
Any particular reason to change ' to " in the Swedish translation?
[cut]
+#: builtin/add.c:191
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
"Ospårade" -> "Icke-köade"
[cut]
> +#: builtin/archive.c:17
> +#, c-format
> +msgid "could not create archive file '%s'"
> +msgstr "Kunde inte skapa arkivfilen \"%s\""
"Kunde" -> "kunde"
[cut]
> +#: builtin/branch.c:136
> +#, c-format
> +msgid ""
> +"deleting branch '%s' that has been merged to\n"
> +" '%s', but it is not yet merged to HEAD."
> +msgstr ""
> +"tar bort grenen \"%s\" som inte har slagits ihop med\n"
Remove "inte".
> +" \"%s\", men som ännu inte slagits ihop med HEAD."
> +
> +#: builtin/branch.c:140
> +#, c-format
> +msgid ""
> +"not deleting branch '%s' that is not yet merged to\n"
> +" '%s', even though it is merged to HEAD."
> +msgstr ""
> +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
"som inte" -> "som ännu inte"
> +" \"%s\", trots att den har slagits ihop med HEAD."
[cut]
> +#: builtin/branch.c:198
> +#, c-format
> +msgid "Couldn't look up commit object for '%s'"
> +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
"incheckningsobjekt" -> "incheckningsobjektet"?
[cut]
> +#: builtin/branch.c:557
> +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."
"kunde" -> "kan"
> +
> +#: builtin/branch.c:567 builtin/branch.c:571
> +#, c-format
> +msgid "Invalid branch name: '%s'"
> +msgstr "Felaktigt namn på gren: \"%s\""
"namn på gren" -> "grennamn"
> +
> +#: builtin/branch.c:574
> +#, c-format
> +msgid "A branch named '%s' already exists."
> +msgstr "Det finns redan en gren som heter \"%s\""
Add missing period.
[cut]
> +#: builtin/checkout.c:554
> +#, c-format
> +msgid "Switched to and reset branch '%s'\n"
> +msgstr "Växlade till och nollställde grenen \"%s\"\n"
"Växlade" -> "Bytte" ?
> +
> +#: builtin/checkout.c:556
> +#, c-format
> +msgid "Switched to a new branch '%s'\n"
> +msgstr "Växlade till en ny gren \"%s\"\n"
> +
> +#: builtin/checkout.c:558
> +#, c-format
> +msgid "Switched to branch '%s'\n"
> +msgstr "Växlade till grenen \"%s\"\n"
> +
> +#: builtin/checkout.c:575
> +msgid "HEAD is now at"
> +msgstr "HEAD är nu på"
> +
> +#: builtin/checkout.c:603
> +msgid "You are on a branch yet to be born"
> +msgstr "Du är på en gren som ännu inte är född"
"är född" -> "finns" ?
> +
> +#: builtin/checkout.c:617
> +msgid "Previous HEAD position was"
> +msgstr "Tidigare position för HEAD var"
> +
> +#: builtin/checkout.c:730
> +msgid "-B cannot be used with -b"
> +msgstr "-B kan inte användas med -b"
> +
> +#: builtin/checkout.c:738
> +msgid "--patch is incompatible with all other options"
> +msgstr "--patch är inkompatibel med alla andra flaggor"
> +
> +#: builtin/checkout.c:744
> +msgid "--track needs a branch name"
> +msgstr "--track behöver ett namn på en gren"
"namn på en gren" -> "grennamn"
> +
> +#: builtin/checkout.c:751
> +msgid "Missing branch name; try -b"
> +msgstr "Grennamn saknas; försök med -b"
> +
> +#: builtin/checkout.c:757
> +msgid "--orphan and -b|-B are mutually exclusive"
> +msgstr "--orphan och --b|-B kan inte användas samtidigt"
"--b" -> "-b"
[cut]
> +#: builtin/checkout.c:904
> +#, c-format
> +msgid "git checkout: we do not like '%s' as a branch name."
> +msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
"namn på en gren" -> "grennamn"
[cut]
> +#: builtin/commit.c:380
> +msgid "cannot do a partial commit during a merge."
> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
"delvis" -> "partiell"
> +
> +#: builtin/commit.c:389
> +msgid "cannot read the index"
> +msgstr "kan inte läsa indexet"
> +
> +#: builtin/commit.c:409
> +msgid "unable to write temporary index file"
> +msgstr "kunde inte skriva temporär indexfil"
> +
> +#: builtin/commit.c:456 builtin/commit.c:1294
> +msgid "could not parse HEAD commit"
> +msgstr "kunde inte tolka HEAD:s incheckning"
"HEAD:s incheckning" -> "HEAD-incheckningen" ?
[cut]
> +#: builtin/commit.c:650
> +#, c-format
> +msgid ""
> +"#\n"
> +"# It looks like you may be committing a MERGE.\n"
> +"# If this is not correct, please remove the file\n"
> +"#\t%s\n"
> +"# and try again.\n"
> +"#\n"
> +msgstr ""
> +"#\n"
> +"# Det verkar som du checkar in en SAMMANSLAGNING.\n"
> +"# Om det inte stämmer tar du bort filen\n"
> +"#\t%s\n"
> +"# och försöker igen.\n"
> +"#\n"
"tar du bort filen" -> "så ta bort filen" and
"försöker" -> "försök".
> +
> +#: builtin/commit.c:659
> +#, c-format
> +msgid ""
> +"\n"
> +"# Please enter the commit message for your changes."
> +msgstr ""
> +"\n"
> +"# Ange ett incheckningsmeddelande för dina ändringar."
> +
> +#: builtin/commit.c:663
> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be ignored, and an empty message aborts the commit.\n"
> +msgstr ""
> +" Rader som inleds\n"
> +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
> +""
"kommer ignoreras" -> "kommer att ignoreras"
> +
> +#: builtin/commit.c:668
> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
> +"# An empty message aborts the commit.\n"
> +msgstr ""
> +" Rader som inleds\n"
> +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
> +"# Ett tomt meddelande avbryter incheckningen.\n"
"kommer behållas" -> "kommer att behållas"
[cut]
> +#: builtin/commit.c:737
> +msgid "Error building trees"
> +msgstr "Fel vid byggande av träd"
"byggande av träd" -> "trädbygge" ?
> +
> +#: builtin/commit.c:752 builtin/tag.c:321
> +#, c-format
> +msgid "Please supply the message using either -m or -F option.\n"
> +msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
"meddelandet en" -> "meddelandet med en"
[cut]
> +#: builtin/commit.c:880
> +msgid "You are in the middle of a merge -- cannot amend."
> +msgstr "Du är i mitten av en incheckning -- kan inte utöka."
"incheckning" -> "ihopslagning"
[cut]
> +#: builtin/commit.c:939
> +msgid "No paths with --include/--only does not make sense."
> +msgstr "Du måste ange sökvägar tillsammans med --include/--only."
That English message should be changed; double negations don't
make sense... How about "Paths are needed with --include/--only."
> +
> +#: builtin/commit.c:941
> +msgid "Clever... amending the last one with dirty index."
> +msgstr "Smart... utöka den senaste med smutsigt index."
> +
> +#: builtin/commit.c:943
> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
> +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..."
"--only-paths" -> "--only-sökvägar"
[cut]
> +#: builtin/commit.c:1142
> +msgid "couldn't look up newly created commit"
> +msgstr "kunde inte slå upp en precis skapad incheckning"
"slå upp" -> "hitta" ? I have seen this translation for lookup
in some other places, and I think "hitta" is a better translation.
"precis skapad" -> "nyskapad"
> +
> +#: builtin/commit.c:1144
> +msgid "could not parse newly created commit"
> +msgstr "kunde inte tolka en precis skapad incheckning"
"precis skapad" -> "nyskapad"
[cut]
> +#: builtin/commit.c:1375
> +msgid "cannot lock HEAD ref"
> +msgstr "kunde inte låsa HEAD-referens"
"kunde" -> "kan"
"referens" -> "referensen" ?
> +
> +#: builtin/commit.c:1379
> +msgid "cannot update HEAD ref"
> +msgstr "kunde inte uppdatera HEAD-referens"
"kunde" -> "kan"
"referens" -> "referensen" ?
[cut]
> +#: builtin/describe.c:205
> +#, c-format
> +msgid "annotated tag %s not available"
> +msgstr "den dekorerade taggen %s inte tillgänglig"
"dekorerade" -> "annoterade"
> +
> +#: builtin/describe.c:209
> +#, c-format
> +msgid "annotated tag %s has no embedded name"
> +msgstr "den dekorerade taggen %s har inget inbäddat namn"
"dekorerade" -> "annoterade"
[cut]
> +#: builtin/describe.c:319
> +#, c-format
> +msgid ""
> +"No annotated tags can describe '%s'.\n"
> +"However, there were unannotated tags: try --tags."
> +msgstr ""
> +"Inga dekorerade taggar kan beskriva \"%s\".\n"
> +"Det finns dock odekorerade taggar: testa --tags."
"dekorerade" -> "annoterade"
"odekorerade" -> "icke-annoterade" (or possibly "oannoterade",
but I think "icke-annoterade" is better).
[cut
> +#: builtin/fetch.c:230
> +msgid "[up to date]"
> +msgstr "[àjour]"
"[àjour]" -> "[à jour]" ?
[cut]
> +#: builtin/fetch.c:325 builtin/fetch.c:648
> +#, c-format
> +msgid "cannot open %s: %s\n"
> +msgstr "kan inte öppna %s. %s\n"
"%s." -> "%s:"
[cut]
> +#: builtin/fetch.c:917
> +msgid "Fetching a group and specifying refspecs does not make sense"
> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
"från" -> "en" ?
> +
> +#: builtin/gc.c:63
> +#, c-format
> +msgid "Invalid %s: '%s'"
> +msgstr "Felaktigt %s: \"%s\""
I think this should be "Felaktig". This could use a TRANSLATORS
comment to avoid having to check the code to find out what the
first %s is referring to.
[cut]
> +#: builtin/grep.c:252
> +#, c-format
> +msgid "grep: failed to create thread: %s"
> +msgstr "grep: misslyckades skapa tråd. %s"
"." -> ":"
[cut]
> +#: builtin/grep.c:581
> +#, c-format
> +msgid "Failed to chdir: %s"
> +msgstr "Kunde inte byta katalog (chdir): %s"
I think you can skip the " (chdir)" explanation without
loss of information.
> +
> +#: builtin/grep.c:671 builtin/grep.c:697
> +#, c-format
> +msgid "unable to read tree (%s)"
> +msgstr "kunde inte läsa träd (%s)"
> +
> +#: builtin/grep.c:703
> +#, c-format
> +msgid "unable to grep from object of type %s"
> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
"\"grep\"" -> "greppa" ?
> +
> +#: builtin/grep.c:755
> +#, c-format
> +msgid "switch `%c' expects a numerical value"
> +msgstr "flaggan \"%c\" antar ett numeriskt värde"
"antar" -> "förväntar sig"
[cut]
> +#: builtin/init-db.c:34
> +#, c-format
> +msgid "Could not make %s writable by group"
> +msgstr "Kunde inte göra %s skrivbar för grubben"
"grubben" -> "gruppen"
[cut]
> +#: builtin/init-db.c:79
> +#, c-format
> +msgid "cannot opendir '%s'"
> +msgstr "kan inte öppna katalogen (opendir) \"%s\""
Skip " (opendir)".
> +
> +#: builtin/init-db.c:96
> +#, c-format
> +msgid "cannot readlink '%s'"
> +msgstr "kan inte läsa länk (readlink) \"%s\""
"länk (readlink)" -> "länken"
[cut]
> +#: builtin/init-db.c:132
> +#, c-format
> +msgid "insanely long template path %s"
This message is ambiguous. Is it a "template path" or a
"path to a template"? (After checking the code I found it
to be the latter, so the Swedish translation is correct.)
[cut]
> +#. TRANSLATORS: The first '%s' is either "Reinitialized
> +#. existing" or "Initialized empty", the second " shared" or
> +#. "", and the last '%s%s' is the verbatim directory name.
> +#: builtin/init-db.c:355
> +#, c-format
> +msgid "%s%s Git repository in %s%s\n"
> +msgstr "%s%s Git-arkiv i %s%s\n"
> +
> +#: builtin/init-db.c:356
> +msgid "Reinitialized existing"
> +msgstr "Ominitierade befintligt"
> +
> +#: builtin/init-db.c:356
> +msgid "Initialized empty"
> +msgstr "Initierade tomt"
> +
> +#: builtin/init-db.c:357
> +msgid " shared"
> +msgstr " delat"
" delat" -> " och delat" ?
> +
> +#: builtin/init-db.c:376
> +msgid "cannot tell cwd"
> +msgstr "kan inte läsa aktuell katalog (cwd)"
"läsa aktuell katalog (cwd)" -> "avgöra aktuell katalog"
> +
> +#: builtin/init-db.c:450 builtin/init-db.c:457
> +#, c-format
> +msgid "cannot mkdir %s"
> +msgstr "kan inte skapa katalogen (mkdir) %s"
Skip " (mkdir)".
> +
> +#: builtin/init-db.c:461
> +#, c-format
> +msgid "cannot chdir to %s"
> +msgstr "kan inte byta katalog (chdir) till %s"
Skip " (chdir)".
[cut]
> +#: builtin/log.c:630
> +msgid "name of output directory is too long"
> +msgstr "namn på utdatakatalogen är för lång"
"namn" -> "namnet"
"lång" -> "långt"
[cut]
> +#: builtin/log.c:825
> +#, c-format
> +msgid "insane in-reply-to: %s"
> +msgstr "tokigt in-reply-to: %s"
"tokigt" -> "tokig"
[cut]
> +#: builtin/log.c:1166
> +msgid "standard output, or directory, which one?"
> +msgstr "standard ut, eller katalog, vilken skall det vara?"
"vilken" -> "vilket" ?
[cut]
> +#: builtin/merge.c:223
> +msgid "could not run stash."
> +msgstr "kunde köra stash."
"kunde köra" -> "kund inte köra"
[cut]
> +#: builtin/merge.c:396
> +#, c-format
> +msgid "'%s' does not point to a commit"
> +msgstr "\"%s\" verkar inte peka på en incheckning"
"verkar inte peka " -> "pekar inte
[cut]
> +#: builtin/merge.c:651
> +#, c-format
> +msgid "Unknown option for merge-recursive: -X%s"
> +msgstr "Felaktig flagga för merge-recursive: -X%s"
"merge-recursive" -> "rekursiv ihopslagning" ?
[cut]
> +#: builtin/merge.c:1271
> +#, c-format
> +msgid "Using the %s to prepare resolving by hand.\n"
> +msgstr "Använder %s för att förbereda lösning för hand.\n"
"%s" -> "strategin %s" ?
[cut]
> +#: builtin/mv.c:206
> +#, c-format
> +msgid "Renaming %s to %s\n"
> +msgstr "Byter namn på %s till %s\n"
"Byter namn på" -> "Döper om" ?
> +
> +#: builtin/mv.c:209
> +#, c-format
> +msgid "renaming '%s' failed"
> +msgstr "misslyckades byta namn på \"%s\""
"namnbytet av \"%s\" misslyckades"
> +
> +#: builtin/notes.c:122
> +#, c-format
> +msgid "unable to start 'show' for object '%s'"
> +msgstr "kunde int estarta \"show\" för objektet \"%s\""
"int estarta" -> "inte starta"
> +
> +#: builtin/notes.c:128
> +msgid "can't fdopen 'show' output fd"
Horrible English error message...
> +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"
[cut]
> +#: builtin/notes.c:234 builtin/tag.c:445
> +#, c-format
> +msgid "cannot read '%s'"
> +msgstr "kunde inte läsa \"%s\""
"kunde" -> "kan"
[cut]
> +# FIXME: Untranslatable!
> +#. TRANSLATORS: The first %s is one of "git notes ACTION",
> +#. e.g. "add", "copy", "append" etc.
> +#: builtin/notes.c:481
> +#, c-format
> +#
> +msgid "Refusing to %s notes in %s (outside of refs/notes/)"
> +msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)"
> +
> +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614
> +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745
> +#: builtin/notes.c:782 builtin/notes.c:821
> +msgid "too many parameters"
> +msgstr "för många parametrar"
> +
> +#: builtin/notes.c:505
> +msgid "list"
> +msgstr "list"
"list" -> "lista" (assuming this is the first argument to
the message from builtin/notes.c:481 above.)
[cut]
> +#: builtin/notes.c:638
> +msgid "copy"
> +msgstr "copy"
"copy" -> "kopiera" (assuming this is the first argument to
the message from builtin/notes.c:481 above.)
[cut]
> +#: builtin/notes.c:754
> +msgid "show"
> +msgstr "show"
"show" -> "visa" (assuming this is the first argument to
the message from builtin/notes.c:481 above.)
> +
> +#: builtin/notes.c:791
> +msgid "remove"
> +msgstr "remove"
"remove" -> "ta bort" (assuming this is the first argument to
the message from builtin/notes.c:481 above.)
> +
> +#: builtin/notes.c:795
> +#, c-format
> +msgid "Object %s has no note\n"
> +msgstr "Objektet %s har ingen anteckning\n"
> +
> +#: builtin/notes.c:825
> +msgid "prune"
> +msgstr "prune"
"prune" -> "rensa" (assuming this is the first argument to
the message from builtin/notes.c:481 above.)
[cut]
> +#: builtin/push.c:77
> +#, c-format
> +msgid "The current branch %s is tracking multiple branches, refusing
> to push."
> +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."
"sända" -> "trycka iväg" ?
[cut]
> +#: builtin/push.c:132
> +#, c-format
> +msgid ""
> +"To prevent you from losing history, non-fast-forward updates were rejected\n"
> +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
> +"'Note about fast-forwards' section of 'git push --help' for details.\n"
> +msgstr ""
> +"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n"
> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n"
> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n"
"icke snabbspolande" -> "icke-snabbspolande"
"t.ex" -> "t ex"
[cut]
> +#: builtin/reset.c:97
> +msgid "Failed to find tree of HEAD."
> +msgstr "Kunde inte hitta träder för HEAD."
"träder" -> "trädet"
> +
> +#: builtin/reset.c:103
> +#, c-format
> +msgid "Failed to find tree of %s."
> +msgstr "Kunde inte hitta träder för %s."
"träder" -> "trädet"
[cut]
> +#: builtin/reset.c:307
> +#, c-format
> +msgid "Could not parse object '%s'."
> +msgstr "Kan inte tolka objektet \"%s\""
"Kan" -> "Kunde"
> +
> +#: builtin/reset.c:312
> +msgid "--patch is incompatible with --{hard,mixed,soft}"
> +msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
> +
> +#: builtin/reset.c:321
> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
"." -> " istället."
[cut]
> +#: builtin/revert.c:270
> +#, c-format
> +msgid "Error wrapping up %s"
> +msgstr "Fel vid ombrytning av %s"
I do not think this "wrapping up" refers to reformatting of
the commit message. I think it refers to finishing writing the
message (a rephrasing of the English message is advisable).
Thus the Swedish translation should probably be:
"Fel vid avslutandet av %s"
> +
> +#: builtin/revert.c:290
> +msgid ""
> +"Your local changes would be overwritten by revert.\n"
> +"Please, commit your changes or stash them to proceed."
> +msgstr ""
> +"Dina lokala ändringar skulle skrivas över av \"revert\".\n"
> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
"stash" -> "git stash" ?
> +
> +#: builtin/revert.c:293
> +msgid ""
> +"Your local changes would be overwritten by cherry-pick.\n"
> +"Please, commit your changes or stash them to proceed."
> +msgstr ""
> +"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n"
> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
"stash" -> "git stash" ?
[cut]
> +#: builtin/revert.c:449
> +#, c-format
> +msgid "Mainline was specified but commit %s is not a merge."
> +msgstr "Huvudlinje angavs, men incheckningen %s är inte en
> sammanslagning"
"Huvudlinje" -> "Huvudspår" ?
[cut]
> +#: builtin/rm.c:118
> +#, c-format
> +msgid ""
> +"'%s' has staged content different from both the file and the HEAD\n"
> +"(use -f to force removal)"
> +msgstr ""
> +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"
> +"(använd -f för att tvinga borttagning)"
"köat" -> "köade"
[cut]
> +#: builtin/shortlog.c:161
> +#, c-format
> +msgid "Missing author: %s"
> +msgstr "Saknad författare: %s"
"Saknad" -> "Saknar"
> +
> +#: builtin/tag.c:123 builtin/tag.c:464
> +#, c-format
> +msgid "tag name too long: %.*s..."
> +msgstr "taggnamnet för långt: %.*s..."
"taggnamnet för" -> "taggnamnet är för"
> +
> +#: builtin/tag.c:128
> +#, c-format
> +msgid "tag '%s' not found."
> +msgstr "taggen \"%s\" hittades inte."
> +
> +#: builtin/tag.c:143
> +#, c-format
> +msgid "Deleted tag '%s' (was %s)\n"
> +msgstr "Tog bort tagg \"%s\" (var %s)\n"
> +
> +#: builtin/tag.c:155
> +#, c-format
> +msgid "could not verify the tag '%s'"
> +msgstr "kunde inte bekräfta taggen \"%s\""
> +
> +#: builtin/tag.c:170
> +msgid "committer info too long."
> +msgstr "incheckarinformation för lång."
"incheckarinformation för" -> "incheckarinformation är för"
> +
> +#: builtin/tag.c:190
> +msgid "could not run gpg."
> +msgstr "kunde inte köra gpg."
> +
> +#: builtin/tag.c:196
> +msgid "gpg did not accept the tag data"
> +msgstr "gpg godtog inte taggdata"
"taggdata" -> "taggdatan"
> +
> +#: builtin/tag.c:203
> +msgid "gpg failed to sign the tag"
> +msgstr "gpg misslyckades signera taggen"
"signera" -> "att signera"
[cut]
> +#: builtin/tag.c:226
> +#, c-format
> +msgid "signing key value too long (%.10s...)"
> +msgstr "signeringsnyckelvärdet för långt (%.10s...)"
"för" -> "är för"
[cut]
> +#: builtin/tag.c:302
> +msgid "tag header too big."
> +msgstr "tagghuvud för stort."
"tagghuvud för stort." - "för stort tagghuvud."
> +
> +#: builtin/tag.c:329
> +msgid "no tag message?"
> +msgstr "inget taggmeddelande?"
> +
> +#: builtin/tag.c:335
> +#, c-format
> +msgid "The tag message has been left in %s\n"
> +msgstr "Taggmeddelandet har lämnats i %s\n"
"lämnats" -> "lämnats kvar"
> +
> +#: builtin/tag.c:428
> +msgid "-n option is only allowed with -l."
> +msgstr "Flaggan -n är endast tillåten tillsammans med -l."
"Flaggan" -> "flaggan" (guess based on other error messages)
> +
> +#: builtin/tag.c:430
> +msgid "--contains option is only allowed with -l."
> +msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
"Flaggan" -> "flaggan" (guess based on other error messages)
[cut]
> +#: git-am.sh:120
> +msgid ""
> +"Did you hand edit your patch?\n"
> +"It does not apply to blobs recorded in its index."
> +msgstr ""
> +"Vill du handredigera din patch?\n"
> +"Den kan inte appliceras på blobbar som antecknats i dess index."
"Vill du handredigera" -> "Handredigerade du"
"antecknats" -> "finns"
[cut]
//Peter
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease
2010-09-13 7:15 ` Peter Krefting
@ 2010-09-13 12:47 ` Ævar Arnfjörð Bjarmason
2010-09-13 13:35 ` [PATCH 2/2] Add Swedish translation Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-13 12:47 UTC (permalink / raw)
To: git; +Cc: Peter Krefting, Ævar Arnfjörð Bjarmason
Change the "pot" target so that the xgettext(1) invocation no longer
include test files from t/t0200.
These should only be included in the Icelandic is.po file since Git's
own test suite uses them for regression tests, but nobody else should
translate them. Previously I indicated this with a TRANSLATORS comment
for all the strings:
#. TRANSLATORS: This is a test. You don't need to translate it.
#, c-format
msgid "TEST: A C test string %s"
msgstr ""
But if translators follow those instructions they'll never have 100%
translation coverage. It's much better to add a hidden option so that
is.po now has to use a special git.pot file for msgmerge(1):
make pot XGETTEXT_INCLUDE_TESTS=YesPlease
But everything else can continue to use the documented:
make pot
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
On Mon, Sep 13, 2010 at 07:15, Peter Krefting <peter@softwolves.pp.se> wrote:
> Ævar Arnfjörð Bjarmason:
>> * You're translating the TEST: messages, it's redundant except for
>> Icelandic (which uses it for git.git tests), but I can see how it
>> can be painful to have non-100% translation coverage.
>
> I just copied them verbatim, I didn't actually translate them. Without
> translating them I can't tell if I've translated everything when doing a
> "msgfmt -vvv --check sv.po".
This is a much better solution then. I'll submit this as part of an
updated ab/i18n series.
Makefile | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 8cec626..680e578 100644
--- a/Makefile
+++ b/Makefile
@@ -2047,9 +2047,15 @@ XGETTEXT_OPTIONS_C = $(XGETTEXT_OPTIONS) --keyword=_ --keyword=N_ --language=C
XGETTEXT_OPTIONS_SH = $(XGETTEXT_OPTIONS) --language=Shell
XGETTEXT_OPTIONS_PERL = $(XGETTEXT_OPTIONS) --keyword=__ --language=Perl
-LOCALIZED_C = $(C_OBJ:o=c) t/t0200/test.c
-LOCALIZED_SH = $(SCRIPT_SH) t/t0200/test.sh
-LOCALIZED_PERL = $(SCRIPT_PERL) t/t0200/test.perl
+LOCALIZED_C = $(C_OBJ:o=c)
+LOCALIZED_SH = $(SCRIPT_SH)
+LOCALIZED_PERL = $(SCRIPT_PERL)
+
+ifdef XGETTEXT_INCLUDE_TESTS
+LOCALIZED_C += t/t0200/test.c
+LOCALIZED_SH += t/t0200/test.sh
+LOCALIZED_PERL += t/t0200/test.perl
+endif
pot:
$(XGETTEXT) $(XGETTEXT_OPTIONS_C) $(LOCALIZED_C)
--
1.7.2.3.313.gcd15
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-13 7:15 ` Peter Krefting
2010-09-13 12:47 ` [PATCH] Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease Ævar Arnfjörð Bjarmason
@ 2010-09-13 13:35 ` Ævar Arnfjörð Bjarmason
2010-09-13 13:45 ` Peter Krefting
2010-09-15 22:38 ` Ævar Arnfjörð Bjarmason
1 sibling, 2 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-13 13:35 UTC (permalink / raw)
To: Peter Krefting; +Cc: git
On Mon, Sep 13, 2010 at 07:15, Peter Krefting <peter@softwolves.pp.se> wrote:
> Ævar Arnfjörð Bjarmason:
>
>> * Doesn't follow the "Initializing a .po file" docs in
>> t/README. Here's what you get after applying the little Perl
>> cleanup program there to it:
>
> Well, I just used the standard commands for creating it.
What commands did you use? I different things on GNU gettext 0.18.1
using the commands documented in po/README, e.g.:
@@ -12,0 +13 @@ msgstr ""
+"Language: sv\n"
@@ -16 +17 @@ msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
And the line wrapping is different after a msgmerge:
@@ -533 +532,3 @@ 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"
+msgstr ""
+"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
+"grennamn"
Which is probably because you edited it with an unofficial PO editor
(i.e. not Emacs's po-mode.el) and didn't do msgmerge afterwards.
>> @@ -1,54 +1,38 @@
>> -# Swedish translation of git
>> -# Copyright © 2010 Peter krefting <peter@softwolves.pp.se>
>> -# Peter Krefting <peter@softwolves.pp.se>, 2010.
>> -#
>
> That's a standard header, which is good to keep for clarity. If we want to
> go through Translation Project (which I still do recommend), it is required.
We could just autogenerate it from the git.git logs before uploading
to the Translation Project if it comes to that. Having comments before
the <msgstr ""> also means it can't be updated with the example
snippet in po/README.
>> -"PO-Revision-Date: 2010-09-12 21:07+0100\n"
>
> That's a good reference header to see how out-of-date the translation is.
But redundant to `git log sv.po | grep ^Date | head -n1`. And since
it's autogenerated it'll cause merge conflicts across different git
branches eventually.
>> -"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
>> -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
>
> These are standard headers to make it easier to find out who to blame the
> translation on. I haven't actually submitted my translation for review on
> the Swedish list yet, but will do so soon enough.
Ditto redundant to `git log sv.po | grep ^Author`. .
>> -#: wt-status.c:56
>
> These context lines are invaluable when figuring out how to translate stuff,
> and to track back strings after the fact. I do not like the idea of removing
> them.
Yes they're useful while translating. But as documented in po/README's
"Updating a .po file" you can use them while doing that without
submitting them to git.git.
If they're included the majority of any po/*.po update will be updates
to auto-generated line number comments.
Anyway, I don't feel strongly about any of the above. Maybe we're
omitting some some PO header entries that we should use, and maybe we
should include PO commits (although that'd need a custom merge
driver).
But we should do that with a patch to po/README and implement it
consistently across all the po/*.po files, having something that
deviates from the norm is a pain to maintain.
>> * Commit message should be "po/sv.po: add Swedish translation". It
>> makes it much easier to `git log --grep=po/` or `git log
>> --grep=po/sv.po` in the future.
>
> Git has that information already, no need to put it in the commit message
> :-)
It's not using the "<subsystem>: <message> <no-full-stop>"
convention. All the existing commits in ab/i18n use that convention,
and I'd prefer to keep it that way.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-13 13:35 ` [PATCH 2/2] Add Swedish translation Ævar Arnfjörð Bjarmason
@ 2010-09-13 13:45 ` Peter Krefting
2010-09-13 15:45 ` Ævar Arnfjörð Bjarmason
2010-09-15 22:38 ` Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 24+ messages in thread
From: Peter Krefting @ 2010-09-13 13:45 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git
Ævar Arnfjörð Bjarmason:
> What commands did you use? I different things on GNU gettext 0.18.1
> using the commands documented in po/README, e.g.:
I have 0.17, so there may be changes since then.
> @@ -12,0 +13 @@ msgstr ""
> +"Language: sv\n"
gtranslator (at least in the version I'm using) kills that line for me.
> @@ -16 +17 @@ msgstr ""
> -"Plural-Forms: nplurals=2; plural=(n != 1);"
> +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
another gtranslator oddity (it removes the trailing \n). That one doesn't
matter, though.
> And the line wrapping is different after a msgmerge:
I didn't run msgmerge on the output from gtranslator. If I do that, I get
your wrapped version.
> Having comments before the <msgstr ""> also means it can't be updated with
> the example snippet in po/README.
Huh? I've never had problems with that in any project I work on. And some of
the editors (notably KBabel) even inserts these comments by itself.
> But redundant to `git log sv.po | grep ^Date | head -n1`.
No. That gives you when the translation was *committed*, not when the
string set it used as a base for translation was created.
> And since it's autogenerated it'll cause merge conflicts across different
> git branches eventually.
PO files don't merge properly between branches anyway (one might be able to
set up a custom merge driver that runs msgmerge between the files, but I've
never been able to get that to work), so they are best avoided. Generally,
you only want to update PO files on the mainline version(s), and ignore them
on merge.
> Ditto redundant to `git log sv.po | grep ^Author`. .
No Language-Team. But, sure. You would have to delete them every time since
any sane PO file editor will add them back automatically on each edit.
> Yes they're useful while translating. But as documented in po/README's
> "Updating a .po file" you can use them while doing that without submitting
> them to git.git.
Sure. But then again you would have to remember to delete them manually.
Everything that requires an extra step of manual commands will make the
hurdle to create translations higher.
> It's not using the "<subsystem>: <message> <no-full-stop>"
> convention. All the existing commits in ab/i18n use that convention,
> and I'd prefer to keep it that way.
Well, I don't really care either way.
Expect an updated version after I go through the review comments I got (I've
also posted the translation to the TP-SV list for review there).
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-13 13:45 ` Peter Krefting
@ 2010-09-13 15:45 ` Ævar Arnfjörð Bjarmason
2010-09-14 8:25 ` Peter Krefting
0 siblings, 1 reply; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-13 15:45 UTC (permalink / raw)
To: Peter Krefting; +Cc: git
On Mon, Sep 13, 2010 at 13:45, Peter Krefting <peter@softwolves.pp.se> wrote:
> Ævar Arnfjörð Bjarmason:
>
>> What commands did you use? I different things on GNU gettext 0.18.1
>> using the commands documented in po/README, e.g.:
>
> I have 0.17, so there may be changes since then.
>
>> @@ -12,0 +13 @@ msgstr ""
>> +"Language: sv\n"
>
> gtranslator (at least in the version I'm using) kills that line for me.
>
>> @@ -16 +17 @@ msgstr ""
>> -"Plural-Forms: nplurals=2; plural=(n != 1);"
>> +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
>
> another gtranslator oddity (it removes the trailing \n). That one doesn't
> matter, though.
>
>> And the line wrapping is different after a msgmerge:
>
> I didn't run msgmerge on the output from gtranslator. If I do that, I get
> your wrapped version.
I see. Emacs's po-mode is maintained as part of gettext.git, so they
probably make sure it has the same line wrapping rules, while
gtranslator uses something different.
>> Having comments before the <msgstr ""> also means it can't be updated with
>> the example snippet in po/README.
>
> Huh? I've never had problems with that in any project I work on. And some of
> the editors (notably KBabel) even inserts these comments by itself.
I just mean that if we start doing that I'd have to update the naïve
munger in po/README's "Initializing a .po file" section. It's not a
problem for the format itself.
Anyway, we might want to have these to be consistent with the rest of
git, which usually adds copyright comments at the top.
>> But redundant to `git log sv.po | grep ^Date | head -n1`.
>
> No. That gives you when the translation was *committed*, not when the string
> set it used as a base for translation was created.
True, but the PO Date header doesn't tell you what commit the
translation is based on, just when the translator did msginit. So it's
not very useful either.
The best indicator in any case of what needs to be updated is msgmerge
on git.git HEAD.
>> And since it's autogenerated it'll cause merge conflicts across different
>> git branches eventually.
>
> PO files don't merge properly between branches anyway (one might be able to
> set up a custom merge driver that runs msgmerge between the files, but I've
> never been able to get that to work), so they are best avoided. Generally,
> you only want to update PO files on the mainline version(s), and ignore them
> on merge.
Yeah, but they'll merge a lot easier if we don't have autogenerated
comments in them, and the patch churn will be a lot smaller and more
readable.
I don't think there's any significant advantage to keeping these
comments *in git.git*. At least I can't see a difference when doing
msgmerge, or some feature we miss from reading the gettext manual.
Of course they're very useful for editing, but that's easily handled
by some make target.
>> Ditto redundant to `git log sv.po | grep ^Author`. .
>
> No Language-Team. But, sure. You would have to delete them every time since
> any sane PO file editor will add them back automatically on each edit.
Hopefully they'll apply my patch so po-mode.el will stop doing that:
https://savannah.gnu.org/bugs/?30835
>> Yes they're useful while translating. But as documented in po/README's
>> "Updating a .po file" you can use them while doing that without submitting
>> them to git.git.
>
> Sure. But then again you would have to remember to delete them manually.
> Everything that requires an extra step of manual commands will make the
> hurdle to create translations higher.
If we keep these limited header and no comment policies I'll probably
just in the future create some script to rewrite the incoming *.po
file, drop it in po/util/* and rewrite submitted PO files without
bothering translators.
>> It's not using the "<subsystem>: <message> <no-full-stop>"
>> convention. All the existing commits in ab/i18n use that convention,
>> and I'd prefer to keep it that way.
>
> Well, I don't really care either way.
I'll just --amend it :)
> Expect an updated version after I go through the review comments I got (I've
> also posted the translation to the TP-SV list for review there).
Yippie. Looking forward to it. And thanks again for translating Git.
The reason I nitpicked your commit was that po/README and interactions
with translators are something we're still working out. So maybe we
want to completely change how we do it.
Threads like these will hopefully help us to arrive at some sane
policy.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-13 15:45 ` Ævar Arnfjörð Bjarmason
@ 2010-09-14 8:25 ` Peter Krefting
0 siblings, 0 replies; 24+ messages in thread
From: Peter Krefting @ 2010-09-14 8:25 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git
Ævar Arnfjörð Bjarmason:
> I see. Emacs's po-mode is maintained as part of gettext.git, so they
> probably make sure it has the same line wrapping rules, while gtranslator
> uses something different.
gtranslator just takes whatever I type, which usually is confined by the
width of my window.
> True, but the PO Date header doesn't tell you what commit the translation
> is based on, just when the translator did msginit. So it's not very useful
> either.
If we do that manually, yes. I agree with not keeping the pot file itself
checked in, but it should probably be generated as part of the tarball
releases, to make it easier for external translators to just grab the file
and translate it. Then the date can be interesting.
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 2/2] Add Swedish translation.
2010-09-13 10:12 ` Peter Kjellerstedt
@ 2010-09-15 10:24 ` Peter Krefting
2010-09-15 15:31 ` Peter Kjellerstedt
2010-09-18 16:46 ` [L10N SE] " Göran Uddeborg
0 siblings, 2 replies; 24+ messages in thread
From: Peter Krefting @ 2010-09-15 10:24 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: Git, Swedish
Peter Kjellerstedt:
> Mainly comments on the Swedish translation below, but there are a few
> references to the English messages as well.
Thanks.
Cc'ing TP-SV as I posted the translation for review there as well.
>> +#: wt-status.c:100
>> +msgid "# (commit or discard the untracked or modified content in submodules)"
>> +msgstr "# (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
> Wouldn't "följa" be a better translation than "spåra" for "track"?
Yeah, perhaps it would. We already use "spåra" in the git-gui/gitk
translations, though, so it needs to be changed everywhere.
> [cut]
>
>> +#: builtin/add.c:41
>> +#, c-format
>> +msgid "unexpected diff status %c"
>> +msgstr "diff-status %c förväntades inte"
> "oväntad diff-status %c" ?
Changed.
>> +#: builtin/add.c:77
>> +#, c-format
>> +msgid "remove '%s'\n"
>> +msgstr "ta bort \"%s\"\n"
> Any particular reason to change ' to " in the Swedish translation?
Yes, Swedish usually uses double-quotes, while English often uses single.
> +#: builtin/add.c:191
> +msgid "Unstaged changes after refreshing the index:"
> +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
> "Ospårade" -> "Icke-köade"
Changing to "oköade".
>> +#: builtin/archive.c:17
>> +#, c-format
>> +msgid "could not create archive file '%s'"
>> +msgstr "Kunde inte skapa arkivfilen \"%s\""
> "Kunde" -> "kunde"
Fixed.
>> +#: builtin/branch.c:136
>> +#, c-format
>> +msgid ""
>> +"deleting branch '%s' that has been merged to\n"
>> +" '%s', but it is not yet merged to HEAD."
>> +msgstr ""
>> +"tar bort grenen \"%s\" som inte har slagits ihop med\n"
> Remove "inte".
Fixed.
>> +" \"%s\", men som ännu inte slagits ihop med HEAD."
>> +
>> +#: builtin/branch.c:140
>> +#, c-format
>> +msgid ""
>> +"not deleting branch '%s' that is not yet merged to\n"
>> +" '%s', even though it is merged to HEAD."
>> +msgstr ""
>> +"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
> "som inte" -> "som ännu inte"
Fixed.
>> +#: builtin/branch.c:198
>> +#, c-format
>> +msgid "Couldn't look up commit object for '%s'"
>> +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
> "incheckningsobjekt" -> "incheckningsobjektet"?
Fixed.
>> +#: builtin/branch.c:557
>> +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."
> "kunde" -> "kan"
Fixed.
>> +#: builtin/branch.c:567 builtin/branch.c:571
>> +#, c-format
>> +msgid "Invalid branch name: '%s'"
>> +msgstr "Felaktigt namn på gren: \"%s\""
> "namn på gren" -> "grennamn"
Changed. I thought mine was easier to read, though :-)
>> +#: builtin/branch.c:574
>> +#, c-format
>> +msgid "A branch named '%s' already exists."
>> +msgstr "Det finns redan en gren som heter \"%s\""
> Add missing period.
Fixed.
>> +#: builtin/checkout.c:554
>> +#, c-format
>> +msgid "Switched to and reset branch '%s'\n"
>> +msgstr "Växlade till och nollställde grenen \"%s\"\n"
> "Växlade" -> "Bytte" ?
Changed "växla" to "byta" globally.
>> +#: builtin/checkout.c:603
>> +msgid "You are on a branch yet to be born"
>> +msgstr "Du är på en gren som ännu inte är född"
> "är född" -> "finns" ?
Yes, sounds better. Changed.
>> +#: builtin/checkout.c:744
>> +msgid "--track needs a branch name"
>> +msgstr "--track behöver ett namn på en gren"
> "namn på en gren" -> "grennamn"
Changed.
>> +#: builtin/checkout.c:757
>> +msgid "--orphan and -b|-B are mutually exclusive"
>> +msgstr "--orphan och --b|-B kan inte användas samtidigt"
> "--b" -> "-b"
Fixed.
>> +#: builtin/checkout.c:904
>> +#, c-format
>> +msgid "git checkout: we do not like '%s' as a branch name."
>> +msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
> "namn på en gren" -> "grennamn"
Fixed.
>> +#: builtin/commit.c:380
>> +msgid "cannot do a partial commit during a merge."
>> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
> "delvis" -> "partiell"
Is that better? Sounds a bit to technical to me.
>> +#: builtin/commit.c:456 builtin/commit.c:1294
>> +msgid "could not parse HEAD commit"
>> +msgstr "kunde inte tolka HEAD:s incheckning"
> "HEAD:s incheckning" -> "HEAD-incheckningen" ?
Yeah, probably better. Changed the other "HEAD:s" translation as well.
>> +#: builtin/commit.c:650
>> +#, c-format
>> +msgid ""
>> +"#\n"
>> +"# It looks like you may be committing a MERGE.\n"
>> +"# If this is not correct, please remove the file\n"
>> +"#\t%s\n"
>> +"# and try again.\n"
>> +"#\n"
>> +msgstr ""
>> +"#\n"
>> +"# Det verkar som du checkar in en SAMMANSLAGNING.\n"
>> +"# Om det inte stämmer tar du bort filen\n"
>> +"#\t%s\n"
>> +"# och försöker igen.\n"
>> +"#\n"
> "tar du bort filen" -> "så ta bort filen" and
> "försöker" -> "försök".
OK. Changed.
>> +#: builtin/commit.c:659
>> +#, c-format
>> +msgid ""
>> +"\n"
>> +"# Please enter the commit message for your changes."
>> +msgstr ""
>> +"\n"
>> +"# Ange ett incheckningsmeddelande för dina ändringar."
>> +
>> +#: builtin/commit.c:663
>> +#, c-format
>> +msgid ""
>> +" Lines starting\n"
>> +"# with '#' will be ignored, and an empty message aborts the commit.\n"
>> +msgstr ""
>> +" Rader som inleds\n"
>> +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
>> +""
> "kommer ignoreras" -> "kommer att ignoreras"
Changed. Now just fits in <80 characters.
>> +#: builtin/commit.c:668
>> +#, c-format
>> +msgid ""
>> +" Lines starting\n"
>> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
>> +"# An empty message aborts the commit.\n"
>> +msgstr ""
>> +" Rader som inleds\n"
>> +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
>> +"# Ett tomt meddelande avbryter incheckningen.\n"
> "kommer behållas" -> "kommer att behållas"
Changed.
>> +#: builtin/commit.c:737
>> +msgid "Error building trees"
>> +msgstr "Fel vid byggande av träd"
> "byggande av träd" -> "trädbygge" ?
That sounds even weirder to me.
>> +#: builtin/commit.c:752 builtin/tag.c:321
>> +#, c-format
>> +msgid "Please supply the message using either -m or -F option.\n"
>> +msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
> "meddelandet en" -> "meddelandet med en"
Fixed.
>> +#: builtin/commit.c:880
>> +msgid "You are in the middle of a merge -- cannot amend."
>> +msgstr "Du är i mitten av en incheckning -- kan inte utöka."
> "incheckning" -> "ihopslagning"
Good catch. Using "sammanslagning" as elsewhere.
>> +#: builtin/commit.c:941
>> +msgid "Clever... amending the last one with dirty index."
>> +msgstr "Smart... utöka den senaste med smutsigt index."
>> +
>> +#: builtin/commit.c:943
>> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
>> +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..."
> "--only-paths" -> "--only-sökvägar"
Oh... Good catch.
>> +#: builtin/commit.c:1142
>> +msgid "couldn't look up newly created commit"
>> +msgstr "kunde inte slå upp en precis skapad incheckning"
> "slå upp" -> "hitta" ? I have seen this translation for lookup
> in some other places, and I think "hitta" is a better translation.
Yeah.
> "precis skapad" -> "nyskapad"
Both changed.
>> +#: builtin/commit.c:1375
>> +msgid "cannot lock HEAD ref"
>> +msgstr "kunde inte låsa HEAD-referens"
>
> "kunde" -> "kan"
> "referens" -> "referensen" ?
Changed (in both).
>> +#: builtin/describe.c:205
>> +#, c-format
>> +msgid "annotated tag %s not available"
>> +msgstr "den dekorerade taggen %s inte tillgänglig"
> "dekorerade" -> "annoterade"
Is that a word?
>> +#: builtin/fetch.c:230
>> +msgid "[up to date]"
>> +msgstr "[àjour]"
> "[àjour]" -> "[à jour]" ?
Changed.
>> +#: builtin/fetch.c:325 builtin/fetch.c:648
>> +#, c-format
>> +msgid "cannot open %s: %s\n"
>> +msgstr "kan inte öppna %s. %s\n"
> "%s." -> "%s:"
Fixed.
>> +#: builtin/fetch.c:917
>> +msgid "Fetching a group and specifying refspecs does not make sense"
>> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> "från" -> "en" ?
Well, I was thinking "fetch" -> "hämta från", and just dropped the "en".
>> +#: builtin/gc.c:63
>> +#, c-format
>> +msgid "Invalid %s: '%s'"
>> +msgstr "Felaktigt %s: \"%s\""
> I think this should be "Felaktig". This could use a TRANSLATORS
> comment to avoid having to check the code to find out what the
> first %s is referring to.
OK, changing.
>> +#: builtin/grep.c:252
>> +#, c-format
>> +msgid "grep: failed to create thread: %s"
>> +msgstr "grep: misslyckades skapa tråd. %s"
> "." -> ":"
Fixed.
>> +#: builtin/grep.c:581
>> +#, c-format
>> +msgid "Failed to chdir: %s"
>> +msgstr "Kunde inte byta katalog (chdir): %s"
> I think you can skip the " (chdir)" explanation without
> loss of information.
As long as the original string uses the system call reference, and not the
action, I will keep it in the translation.
>> +#: builtin/grep.c:703
>> +#, c-format
>> +msgid "unable to grep from object of type %s"
>> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> "\"grep\"" -> "greppa" ?
That's a word that means something else... I don't really have any good idea
on how to translate "grep" when used as a verb...
>> +#: builtin/grep.c:755
>> +#, c-format
>> +msgid "switch `%c' expects a numerical value"
>> +msgstr "flaggan \"%c\" antar ett numeriskt värde"
> "antar" -> "förväntar sig"
Changed (without "sig").
>> +#: builtin/init-db.c:34
>> +#, c-format
>> +msgid "Could not make %s writable by group"
>> +msgstr "Kunde inte göra %s skrivbar för grubben"
> "grubben" -> "gruppen"
Fixed.
>> +#: builtin/init-db.c:79
>> +#, c-format
>> +msgid "cannot opendir '%s'"
>> +msgstr "kan inte öppna katalogen (opendir) \"%s\""
> Skip " (opendir)".
>
>> +#: builtin/init-db.c:96
>> +#, c-format
>> +msgid "cannot readlink '%s'"
>> +msgstr "kan inte läsa länk (readlink) \"%s\""
> "länk (readlink)" -> "länken"
Keeping them for the same reason as above. Changing "länk" to "länken",
though.
>> +#: builtin/init-db.c:357
>> +msgid " shared"
>> +msgstr " delat"
> " delat" -> " och delat" ?
OK.
>> +#: builtin/init-db.c:376
>> +msgid "cannot tell cwd"
>> +msgstr "kan inte läsa aktuell katalog (cwd)"
> "läsa aktuell katalog (cwd)" -> "avgöra aktuell katalog"
Changing, but keeping cwd as above.
>> +#: builtin/log.c:630
>> +msgid "name of output directory is too long"
>> +msgstr "namn på utdatakatalogen är för lång"
> "namn" -> "namnet"
> "lång" -> "långt"
I think this is where I started to get a bit tired :-)
Fixed.
>> +#: builtin/log.c:825
>> +#, c-format
>> +msgid "insane in-reply-to: %s"
>> +msgstr "tokigt in-reply-to: %s"
> "tokigt" -> "tokig"
My sense of language says that it should be "neutrum", so "tokigt".
>> +#: builtin/log.c:1166
>> +msgid "standard output, or directory, which one?"
>> +msgstr "standard ut, eller katalog, vilken skall det vara?"
> "vilken" -> "vilket" ?
Fixed.
>> +#: builtin/merge.c:223
>> +msgid "could not run stash."
>> +msgstr "kunde köra stash."
> "kunde köra" -> "kund inte köra"
Fixed.
>> +#: builtin/merge.c:396
>> +#, c-format
>> +msgid "'%s' does not point to a commit"
>> +msgstr "\"%s\" verkar inte peka på en incheckning"
> "verkar inte peka " -> "pekar inte
Fixed.
>> +#: builtin/merge.c:651
>> +#, c-format
>> +msgid "Unknown option for merge-recursive: -X%s"
>> +msgstr "Felaktig flagga för merge-recursive: -X%s"
> "merge-recursive" -> "rekursiv ihopslagning" ?
No, merge-recursive is a name of a merge strategy.
>> +#: builtin/merge.c:1271
>> +#, c-format
>> +msgid "Using the %s to prepare resolving by hand.\n"
>> +msgstr "Använder %s för att förbereda lösning för hand.\n"
> "%s" -> "strategin %s" ?
Yeah. The English string should probably also be fixed, though.
>> +#: builtin/mv.c:206
>> +#, c-format
>> +msgid "Renaming %s to %s\n"
>> +msgstr "Byter namn på %s till %s\n"
> "Byter namn på" -> "Döper om" ?
I've used "byta namn" in other places, so if I change here, I should change
it globally.
>> +#: builtin/mv.c:209
>> +#, c-format
>> +msgid "renaming '%s' failed"
>> +msgstr "misslyckades byta namn på \"%s\""
> "namnbytet av \"%s\" misslyckades"
Changed.
>> +#: builtin/notes.c:122
>> +#, c-format
>> +msgid "unable to start 'show' for object '%s'"
>> +msgstr "kunde int estarta \"show\" för objektet \"%s\""
> "int estarta" -> "inte starta"
Fixed.
>> +#: builtin/notes.c:128
>> +msgid "can't fdopen 'show' output fd"
> Horrible English error message...
Yeah.
>> +#: builtin/notes.c:234 builtin/tag.c:445
>> +#, c-format
>> +msgid "cannot read '%s'"
>> +msgstr "kunde inte läsa \"%s\""
> "kunde" -> "kan"
Fixed.
> "list" -> "lista" (assuming this is the first argument to the message from
> builtin/notes.c:481 above.)
As I mentioned in 1/2, I though these were used as command names (as one of
them was unified with a command name that I removed). I will try fixing these.
>> +#: builtin/push.c:77
>> +#, c-format
>> +msgid "The current branch %s is tracking multiple branches, refusing
>> to push."
>> +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."
> "sända" -> "trycka iväg" ?
"Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui
translation of "Push". As long as git doesn't grow a "git send" command, I
think that should be OK.
>> +#: builtin/push.c:132
>> +#, c-format
>> +msgid ""
>> +"To prevent you from losing history, non-fast-forward updates were rejected\n"
>> +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
>> +"'Note about fast-forwards' section of 'git push --help' for details.\n"
>> +msgstr ""
>> +"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n"
>> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n"
>> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n"
> "icke snabbspolande" -> "icke-snabbspolande"
Changed.
> "t.ex" -> "t ex"
I think it looks clearer with the full stop.
>> +#: builtin/reset.c:97
>> +msgid "Failed to find tree of HEAD."
>> +msgstr "Kunde inte hitta träder för HEAD."
> "träder" -> "trädet"
Fixed (both of them).
>> +#: builtin/reset.c:307
>> +#, c-format
>> +msgid "Could not parse object '%s'."
>> +msgstr "Kan inte tolka objektet \"%s\""
> "Kan" -> "Kunde"
Fixed.
>> +#: builtin/reset.c:321
>> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
>> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
> "." -> " istället."
I dropped it to fit an 80 character line.
>> +#: builtin/revert.c:270
>> +#, c-format
>> +msgid "Error wrapping up %s"
>> +msgstr "Fel vid ombrytning av %s"
>
> I do not think this "wrapping up" refers to reformatting of the commit
> message. I think it refers to finishing writing the message (a rephrasing
> of the English message is advisable). Thus the Swedish translation should
> probably be:
>
> "Fel vid avslutandet av %s"
Are you sure about that? I was unable to figure it out when I looked at it.
>> +#: builtin/revert.c:290
>> +msgid ""
>> +"Your local changes would be overwritten by revert.\n"
>> +"Please, commit your changes or stash them to proceed."
>> +msgstr ""
>> +"Dina lokala ändringar skulle skrivas över av \"revert\".\n"
>> +"Checka in dina ändringar eller använd \"stash\" för att fortsätta."
> "stash" -> "git stash" ?
Changed (both).
>> +#: builtin/revert.c:449
>> +#, c-format
>> +msgid "Mainline was specified but commit %s is not a merge."
>> +msgstr "Huvudlinje angavs, men incheckningen %s är inte en
>> sammanslagning"
> "Huvudlinje" -> "Huvudspår" ?
Changing, fits closer to the railway analogy.
>> +#: builtin/rm.c:118
>> +#, c-format
>> +msgid ""
>> +"'%s' has staged content different from both the file and the HEAD\n"
>> +"(use -f to force removal)"
>> +msgstr ""
>> +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"
>> +"(använd -f för att tvinga borttagning)"
> "köat" -> "köade"
"%s" expands to a file name, so you are right. It is "%s" that contains the
changes, not "%s" that has staged them.
>> +#: builtin/shortlog.c:161
>> +#, c-format
>> +msgid "Missing author: %s"
>> +msgstr "Saknad författare: %s"
> "Saknad" -> "Saknar"
I think "missing" it is an adjective and not a verb here. The message is
clear either way.
>> +#: builtin/tag.c:123 builtin/tag.c:464
>> +#, c-format
>> +msgid "tag name too long: %.*s..."
>> +msgstr "taggnamnet för långt: %.*s..."
> "taggnamnet för" -> "taggnamnet är för"
Changed. Should probably be changed in English as well.
>> +#: builtin/tag.c:170
>> +msgid "committer info too long."
>> +msgstr "incheckarinformation för lång."
> "incheckarinformation för" -> "incheckarinformation är för"
Changed. Bad English again.
>> +#: builtin/tag.c:196
>> +msgid "gpg did not accept the tag data"
>> +msgstr "gpg godtog inte taggdata"
> "taggdata" -> "taggdatan"
"taggdatana" in that case. "data" is always plural.
>> +#: builtin/tag.c:203
>> +msgid "gpg failed to sign the tag"
>> +msgstr "gpg misslyckades signera taggen"
> "signera" -> "att signera"
Fixed.
>> +#: builtin/tag.c:226
>> +#, c-format
>> +msgid "signing key value too long (%.10s...)"
>> +msgstr "signeringsnyckelvärdet för långt (%.10s...)"
> "för" -> "är för"
Fixed.
>> +#: builtin/tag.c:302
>> +msgid "tag header too big."
>> +msgstr "tagghuvud för stort."
> "tagghuvud för stort." - "för stort tagghuvud."
Changed.
>> +#: builtin/tag.c:335
>> +#, c-format
>> +msgid "The tag message has been left in %s\n"
>> +msgstr "Taggmeddelandet har lämnats i %s\n"
> "lämnats" -> "lämnats kvar"
Much better. Changed.
>> +#: builtin/tag.c:428
>> +msgid "-n option is only allowed with -l."
>> +msgstr "Flaggan -n är endast tillåten tillsammans med -l."
> "Flaggan" -> "flaggan" (guess based on other error messages)
Yes, changed (both).
>> +#: git-am.sh:120
>> +msgid ""
>> +"Did you hand edit your patch?\n"
>> +"It does not apply to blobs recorded in its index."
>> +msgstr ""
>> +"Vill du handredigera din patch?\n"
>> +"Den kan inte appliceras på blobbar som antecknats i dess index."
> "Vill du handredigera" -> "Handredigerade du"
Fixed.
> "antecknats" -> "finns"
That's ambiguous. Changed second sentence to:
"Den kan inte appliceras på de blobbar som beskrivs i dess index."
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 2/2] Add Swedish translation.
2010-09-15 10:24 ` Peter Krefting
@ 2010-09-15 15:31 ` Peter Kjellerstedt
2010-09-15 22:46 ` Robin Rosenberg
2010-09-16 10:41 ` [PATCH 2/2] Add Swedish translation Peter Krefting
2010-09-18 16:46 ` [L10N SE] " Göran Uddeborg
1 sibling, 2 replies; 24+ messages in thread
From: Peter Kjellerstedt @ 2010-09-15 15:31 UTC (permalink / raw)
To: Peter Krefting; +Cc: Git, Swedish
> -----Original Message-----
> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
> Behalf Of Peter Krefting
> Sent: den 15 september 2010 12:25
> To: Peter Kjellerstedt
> Cc: Git; Swedish
> Subject: RE: [PATCH 2/2] Add Swedish translation.
>
> Peter Kjellerstedt:
>
> > Mainly comments on the Swedish translation below, but there are a few
> > references to the English messages as well.
>
> Thanks.
>
> Cc'ing TP-SV as I posted the translation for review there as well.
[cut]
> >> +#: builtin/commit.c:380
> >> +msgid "cannot do a partial commit during a merge."
> >> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
> > "delvis" -> "partiell"
>
> Is that better? Sounds a bit to technical to me.
Well, "en delvis incheckning" doesn't sound like correct Swedish...
[cut]
> >> +#: builtin/commit.c:737
> >> +msgid "Error building trees"
> >> +msgstr "Fel vid byggande av träd"
> > "byggande av träd" -> "trädbygge" ?
>
> That sounds even weirder to me.
Hmm, you may be right. Alternatives for "byggande" is
"konstruktion" and "skapande", don't know if either of those
make it sound better.
[cut]
> >> +#: builtin/describe.c:205
> >> +#, c-format
> >> +msgid "annotated tag %s not available"
> >> +msgstr "den dekorerade taggen %s inte tillgänglig"
> > "dekorerade" -> "annoterade"
>
> Is that a word?
Yes. At least it is in SAOL which I think should be indicative
of its existence ;)
[cut]
> >> +#: builtin/fetch.c:917
> >> +msgid "Fetching a group and specifying refspecs does not make sense"
> >> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> > "från" -> "en" ?
>
> Well, I was thinking "fetch" -> "hämta från", and just dropped the
> "en".
Ok.
[cut]
> >> +#: builtin/grep.c:581
> >> +#, c-format
> >> +msgid "Failed to chdir: %s"
> >> +msgstr "Kunde inte byta katalog (chdir): %s"
> > I think you can skip the " (chdir)" explanation without
> > loss of information.
>
> As long as the original string uses the system call reference, and not
> the action, I will keep it in the translation.
Ok (guess the English message could do with an update...)
> >> +#: builtin/grep.c:703
> >> +#, c-format
> >> +msgid "unable to grep from object of type %s"
> >> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> > "\"grep\"" -> "greppa" ?
>
> That's a word that means something else... I don't really have any good
> idea on how to translate "grep" when used as a verb...
Yeah, I know... I've no better suggestion I'm afraid.
[cut]
> >> +#: builtin/log.c:825
> >> +#, c-format
> >> +msgid "insane in-reply-to: %s"
> >> +msgstr "tokigt in-reply-to: %s"
> > "tokigt" -> "tokig"
>
> My sense of language says that it should be "neutrum", so "tokigt".
Well, I read it with an implicit "header" (i.e., as "insane
in-reply-to header: %s")...
[cut]
> >> +#: builtin/merge.c:651
> >> +#, c-format
> >> +msgid "Unknown option for merge-recursive: -X%s"
> >> +msgstr "Felaktig flagga för merge-recursive: -X%s"
> > "merge-recursive" -> "rekursiv ihopslagning" ?
>
> No, merge-recursive is a name of a merge strategy.
Maybe add quotes around it then do indicate that?
> >> +#: builtin/merge.c:1271
> >> +#, c-format
> >> +msgid "Using the %s to prepare resolving by hand.\n"
> >> +msgstr "Använder %s för att förbereda lösning för hand.\n"
> > "%s" -> "strategin %s" ?
>
> Yeah. The English string should probably also be fixed, though.
Agree.
> >> +#: builtin/mv.c:206
> >> +#, c-format
> >> +msgid "Renaming %s to %s\n"
> >> +msgstr "Byter namn på %s till %s\n"
> > "Byter namn på" -> "Döper om" ?
>
> I've used "byta namn" in other places, so if I change here, I should
> change it globally.
Either should work I guess...
[cut]
> >> +#: builtin/push.c:77
> >> +#, c-format
> >> +msgid "The current branch %s is tracking multiple branches, refusing to push."
> >> +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända."
> > "sända" -> "trycka iväg" ?
>
> "Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui
> translation of "Push". As long as git doesn't grow a "git send"
> command, I think that should be OK.
Ok.
> >> +#: builtin/push.c:132
> >> +#, c-format
> >> +msgid ""
> >> +"To prevent you from losing history, non-fast-forward updates were
> rejected\n"
> >> +"Merge the remote changes (e.g. 'git pull') before pushing again.
> See the\n"
> >> +"'Note about fast-forwards' section of 'git push --help' for
> details.\n"
> >> +msgstr ""
> >> +"För att förhindra att du tappar historik har icke snabbspolande
> uppdateringar\n"
> >> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du
> sänder igen.\n"
> >> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för
> detaljer.\n"
> > "icke snabbspolande" -> "icke-snabbspolande"
>
> Changed.
>
> > "t.ex" -> "t ex"
>
> I think it looks clearer with the full stop.
Then it should be "t. ex." according to SAOL.
[cut]
> >> +#: builtin/reset.c:321
> >> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>'
> instead."
> >> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset
> -- <sökvägar>\"."
> > "." -> " istället."
>
> I dropped it to fit an 80 character line.
Ok.
> >> +#: builtin/revert.c:270
> >> +#, c-format
> >> +msgid "Error wrapping up %s"
> >> +msgstr "Fel vid ombrytning av %s"
> >
> > I do not think this "wrapping up" refers to reformatting of the commit
> > message. I think it refers to finishing writing the message (a rephrasing
> > of the English message is advisable). Thus the Swedish translation should
> > probably be:
> >
> > "Fel vid avslutandet av %s"
>
> Are you sure about that? I was unable to figure it out when I looked at
> it.
I am pretty sure. That error message is output in case a file
called "somefile.lock" cannot be closed and renamed to "somefile"
(see lockfile.c:commit_lock_file().)
[cut]
> >> +#: builtin/shortlog.c:161
> >> +#, c-format
> >> +msgid "Missing author: %s"
> >> +msgstr "Saknad författare: %s"
> > "Saknad" -> "Saknar"
>
> I think "missing" it is an adjective and not a verb here. The message
> is clear either way.
Ok.
[cut]
> >> +#: builtin/tag.c:196
> >> +msgid "gpg did not accept the tag data"
> >> +msgstr "gpg godtog inte taggdata"
> > "taggdata" -> "taggdatan"
>
> "taggdatana" in that case. "data" is always plural.
Maybe better to use "tagginformationen"?
[cut]
> >> +#: git-am.sh:120
> >> +msgid ""
> >> +"Did you hand edit your patch?\n"
> >> +"It does not apply to blobs recorded in its index."
> >> +msgstr ""
> >> +"Vill du handredigera din patch?\n"
> >> +"Den kan inte appliceras på blobbar som antecknats i dess index."
> > "Vill du handredigera" -> "Handredigerade du"
>
> Fixed.
>
> > "antecknats" -> "finns"
>
> That's ambiguous. Changed second sentence to:
> "Den kan inte appliceras på de blobbar som beskrivs i dess index."
Good.
> --
> \\// Peter - http://www.softwolves.pp.se/
//Peter
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-13 13:35 ` [PATCH 2/2] Add Swedish translation Ævar Arnfjörð Bjarmason
2010-09-13 13:45 ` Peter Krefting
@ 2010-09-15 22:38 ` Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-15 22:38 UTC (permalink / raw)
To: Peter Krefting; +Cc: git, Bruno Haible, Jakub Narebski
On Mon, Sep 13, 2010 at 13:35, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>>> -#: wt-status.c:56
>>
>> These context lines are invaluable when figuring out how to translate stuff,
>> and to track back strings after the fact. I do not like the idea of removing
>> them.
>
> Yes they're useful while translating. But as documented in po/README's
> "Updating a .po file" you can use them while doing that without
> submitting them to git.git.
>
> If they're included the majority of any po/*.po update will be updates
> to auto-generated line number comments.
After doing some msgmerge on is.po I think omitting these line numbers
might be the wrong move.
msgmerge can get very confused, and mark translations fuzzy across
unrelated files, presumably that wouldn't happen if they were there. I
haven't tested it though.
CC-ing the gettext maintainer, maybe he has some insights. The gettext
manual doesn't discuss this as far as I can see.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-15 15:31 ` Peter Kjellerstedt
@ 2010-09-15 22:46 ` Robin Rosenberg
2010-09-16 7:49 ` Peter Kjellerstedt
2010-09-16 11:23 ` Peter Krefting
2010-09-16 10:41 ` [PATCH 2/2] Add Swedish translation Peter Krefting
1 sibling, 2 replies; 24+ messages in thread
From: Robin Rosenberg @ 2010-09-15 22:46 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: Peter Krefting, Git, Swedish
onsdagen den 15 september 2010 17.31.43 skrev Peter Kjellerstedt:
> > -----Original Message-----
> > From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
> > Behalf Of Peter Krefting
> > Sent: den 15 september 2010 12:25
> > To: Peter Kjellerstedt
> > Cc: Git; Swedish
> > Subject: RE: [PATCH 2/2] Add Swedish translation.
> >
> > Peter Kjellerstedt:
> > > Mainly comments on the Swedish translation below, but there are a few
> > > references to the English messages as well.
> >
> > Thanks.
> >
> > Cc'ing TP-SV as I posted the translation for review there as well.
>
> [cut]
>
> > >> +#: builtin/commit.c:380
> > >> +msgid "cannot do a partial commit during a merge."
> > >> +msgstr "kan inte utföra en delvis incheckning under en
> > >> sammanslagning."
> > >
> > > "delvis" -> "partiell"
> >
> > Is that better? Sounds a bit to technical to me.
>
> Well, "en delvis incheckning" doesn't sound like correct Swedish...
Håller med. "delvis incheckning" är inte svenska.
(My comments are in swedish as it feels more natural in this context).
> [cut]
>
> > >> +#: builtin/commit.c:737
> > >> +msgid "Error building trees"
> > >> +msgstr "Fel vid byggande av träd"
> > >
> > > "byggande av träd" -> "trädbygge" ?
> >
> > That sounds even weirder to me.
>
> Hmm, you may be right. Alternatives for "byggande" is
> "konstruktion" and "skapande", don't know if either of those
> make it sound better.
Skriv om hel.
Kunde inte bygga trädet.
> [cut]
>
> > >> +#: builtin/describe.c:205
> > >> +#, c-format
> > >> +msgid "annotated tag %s not available"
> > >> +msgstr "den dekorerade taggen %s inte tillgänglig"
> > >
> > > "dekorerade" -> "annoterade"
> >
> > Is that a word?
>
> Yes. At least it is in SAOL which I think should be indicative
> of its existence ;)
Dekorerade låter konstigt. "annoterade" eller "kommenterade" funkar.
> [cut]
>
> > >> +#: builtin/fetch.c:917
> > >> +msgid "Fetching a group and specifying refspecs does not make sense"
> > >> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> > >
> > > "från" -> "en" ?
> >
> > Well, I was thinking "fetch" -> "hämta från", and just dropped the
> > "en".
>
> Ok.
Ni byter mening. Den engelska texten antyder att det man försöker inte kan
fungera, medan översättningen betyder att operationen inte lyckades den här
gången.
"Det är inte möjligt att hämta en grupp och samtidigt ange
referensspecifikationer"
Jag lyfte medvetet bort idiotförklaringen av användaren.
> [cut]
>
> > >> +#: builtin/grep.c:581
> > >> +#, c-format
> > >> +msgid "Failed to chdir: %s"
> > >> +msgstr "Kunde inte byta katalog (chdir): %s"
> > >
> > > I think you can skip the " (chdir)" explanation without
> > > loss of information.
> >
> > As long as the original string uses the system call reference, and not
> > the action, I will keep it in the translation.
>
> Ok (guess the English message could do with an update...)
>
> > >> +#: builtin/grep.c:703
> > >> +#, c-format
> > >> +msgid "unable to grep from object of type %s"
> > >> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> > >
> > > "\"grep\"" -> "greppa" ?
> >
> > That's a word that means something else... I don't really have any good
> > idea on how to translate "grep" when used as a verb...
>
> Yeah, I know... I've no better suggestion I'm afraid.
Varför ändra tempus? s/Kunde/Kan/. Som tidigare så handlar det inte
om att greppandet misslyckades denna gång. Det /kan/ inte fungera nån
gång (i denna version av Git). Dessutom är det inte viktigt om grep eller
nån annan mekanism används.
"Kan inte utföra textsökning i \"%s\"-objekt"
> [cut]
>
> > >> +#: builtin/log.c:825
> > >> +#, c-format
> > >> +msgid "insane in-reply-to: %s"
> > >> +msgstr "tokigt in-reply-to: %s"
> > >
> > > "tokigt" -> "tokig"
> >
> > My sense of language says that it should be "neutrum", so "tokigt".
>
> Well, I read it with an implicit "header" (i.e., as "insane
> in-reply-to header: %s")...
"tokigt värde för \"in-reply-to\""
> [cut]
>
> > >> +#: builtin/merge.c:651
> > >> +#, c-format
> > >> +msgid "Unknown option for merge-recursive: -X%s"
> > >> +msgstr "Felaktig flagga för merge-recursive: -X%s"
> > >
> > > "merge-recursive" -> "rekursiv ihopslagning" ?
> >
> > No, merge-recursive is a name of a merge strategy.
>
> Maybe add quotes around it then do indicate that?
Citera när ordet inte skall överättas.
"Felaktig flagga för \"merge-recursive\": -X%s"
> > >> +#: builtin/merge.c:1271
> > >> +#, c-format
> > >> +msgid "Using the %s to prepare resolving by hand.\n"
> > >> +msgstr "Använder %s för att förbereda lösning för hand.\n"
> > >
> > > "%s" -> "strategin %s" ?
> >
> > Yeah. The English string should probably also be fixed, though.
>
> Agree.
+1
> > >> +#: builtin/mv.c:206
> > >> +#, c-format
> > >> +msgid "Renaming %s to %s\n"
> > >> +msgstr "Byter namn på %s till %s\n"
> > >
> > > "Byter namn på" -> "Döper om" ?
> >
> > I've used "byta namn" in other places, so if I change here, I should
> > change it globally.
>
> Either should work I guess...
Trenden är nog att alltmer använda religiösa termer enbart för religion. Titta
i andra program så ser ni att "Byt namn..." oftast är det som används i menyer
o.dyl. Däremot använder man ofta "döpa om" i talspråk.
> [cut]
>
> > >> +#: builtin/push.c:77
> > >> +#, c-format
> > >> +msgid "The current branch %s is tracking multiple branches, refusing
> > >> to push." +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar
> > >> sända."
> > >
> > > "sända" -> "trycka iväg" ?
> >
> > "Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui
> > translation of "Push". As long as git doesn't grow a "git send"
> > command, I think that should be OK.
Översättningarna i Git-gui är prejudicerande för denna översättning. Sen
kanske de inte är 100%-aga heller, men i så fall bör både C Git och Git Gui
ändras. Sen finns kanske ytterligare översättningar av andra Git-verktyg.
Personligen föredrar jag nog Skicka. Absolut inte trycka.
> Ok.
>
> > >> +#: builtin/push.c:132
> > >> +#, c-format
> > >> +msgid ""
> > >> +"To prevent you from losing history, non-fast-forward updates were
> > rejected\n"
> > >> +"Merge the remote changes (e.g. 'git pull') before pushing again.
> > See the\n"
> > >> +"'Note about fast-forwards' section of 'git push --help' for
> > details.\n"
> > >> +msgstr ""
> > >> +"För att förhindra att du tappar historik har icke snabbspolande
> > uppdateringar\n"
> > >> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du
> > sänder igen.\n"
> >
> > >> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för
> >
> > detaljer.\n"
> >
> > > "icke snabbspolande" -> "icke-snabbspolande"
> >
> > Changed.
> >
> > > "t.ex" -> "t ex"
> >
> > I think it looks clearer with the full stop.
>
> Then it should be "t. ex." according to SAOL.
Har inte senast upplagan, men jag tror inte det. Det skall vara "t ex" eller
"t.ex." enligt
Myndigheternas Skrivregler. Svenska Akademien använder "t.ex." på webben i
alla fall (utan blank).
> [cut
>
> > >> +#: builtin/reset.c:321
> > >> +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>'
> >
> > instead."
> >
> > >> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git reset
> >
> > -- <sökvägar>\"."
> >
> > > "." -> " istället."
> >
> > I dropped it to fit an 80 character line.
>
> Ok.
>
> > >> +#: builtin/revert.c:270
> > >> +#, c-format
> > >> +msgid "Error wrapping up %s"
> > >> +msgstr "Fel vid ombrytning av %s"
> > >
> > > I do not think this "wrapping up" refers to reformatting of the commit
> > > message. I think it refers to finishing writing the message (a
> > > rephrasing of the English message is advisable). Thus the Swedish
> > > translation should probably be:
> > >
> > > "Fel vid avslutandet av %s"
> >
> > Are you sure about that? I was unable to figure it out when I looked at
> > it.
>
> I am pretty sure. That error message is output in case a file
> called "somefile.lock" cannot be closed and renamed to "somefile"
> (see lockfile.c:commit_lock_file().)
Felmeddelandet är inte vettigt på engelska heller. Kanske detta?
"Kunde inte avsluta skrivning av filen %s"
> [cut]
>
> > >> +#: builtin/shortlog.c:161
> > >> +#, c-format
> > >> +msgid "Missing author: %s"
> > >> +msgstr "Saknad författare: %s"
> > >
> > > "Saknad" -> "Saknar"
> >
> > I think "missing" it is an adjective and not a verb here. The message
> > is clear either way.
>
> Ok.
Usch.
"Författare saknas i: %s"
Det funkar inte så bra att forkorta lika hårt som i engelska", därav det lilla
"i"-et.
> [cut]
>
> > >> +#: builtin/tag.c:196
> > >> +msgid "gpg did not accept the tag data"
> > >> +msgstr "gpg godtog inte taggdata"
> > >
> > > "taggdata" -> "taggdatan"
> >
> > "taggdatana" in that case. "data" is always plural.
Innovativt :) Data är plural och singularform saknas (om
man inte går tillbaka till latinets datum, men det är ingen
som använder på svenska i den betydelsen).
> Maybe better to use "tagginformationen"?
Tag = etikett
"gpg accepterade inte etikettinformationen"
>
> [cut]
>
> > >> +#: git-am.sh:120
> > >> +msgid ""
> > >> +"Did you hand edit your patch?\n"
> > >> +"It does not apply to blobs recorded in its index."
> > >> +msgstr ""
> > >> +"Vill du handredigera din patch?\n"
> > >> +"Den kan inte appliceras på blobbar som antecknats i dess index."
> > >
> > > "Vill du handredigera" -> "Handredigerade du"
> >
> > Fixed.
> >
> > > "antecknats" -> "finns"
> >
> > That's ambiguous. Changed second sentence to:
> > "Den kan inte appliceras på de blobbar som beskrivs i dess index."
>
> Good.
-- robin
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 2/2] Add Swedish translation.
2010-09-15 22:46 ` Robin Rosenberg
@ 2010-09-16 7:49 ` Peter Kjellerstedt
2010-09-16 7:57 ` Jeremiah Foster
2010-09-16 11:23 ` Peter Krefting
1 sibling, 1 reply; 24+ messages in thread
From: Peter Kjellerstedt @ 2010-09-16 7:49 UTC (permalink / raw)
To: Robin Rosenberg; +Cc: Peter Krefting, Git, Swedish
> -----Original Message-----
> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
> Behalf Of Robin Rosenberg
> Sent: den 16 september 2010 00:47
> To: Peter Kjellerstedt
> Cc: Peter Krefting; Git; Swedish
> Subject: Re: [PATCH 2/2] Add Swedish translation.
>
> onsdagen den 15 september 2010 17.31.43 skrev Peter Kjellerstedt:
> > > -----Original Message-----
> > > From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org]
> > > On Behalf Of Peter Krefting
> > > Sent: den 15 september 2010 12:25
> > > To: Peter Kjellerstedt
> > > Cc: Git; Swedish
> > > Subject: RE: [PATCH 2/2] Add Swedish translation.
> > >
> > > Peter Kjellerstedt:
> > > > Mainly comments on the Swedish translation below, but there are a
> > > > few references to the English messages as well.
> > >
> > > Thanks.
> > >
> > > Cc'ing TP-SV as I posted the translation for review there as well.
> >
> > [cut]
> >
> > > >> +#: builtin/commit.c:380
> > > >> +msgid "cannot do a partial commit during a merge."
> > > >> +msgstr "kan inte utföra en delvis incheckning under en
> > > >> sammanslagning."
> > > >
> > > > "delvis" -> "partiell"
> > >
> > > Is that better? Sounds a bit to technical to me.
> >
> > Well, "en delvis incheckning" doesn't sound like correct Swedish...
>
> Håller med. "delvis incheckning" är inte svenska.
>
> (My comments are in swedish as it feels more natural in this context).
>
> > [cut]
> >
> > > >> +#: builtin/commit.c:737
> > > >> +msgid "Error building trees"
> > > >> +msgstr "Fel vid byggande av träd"
> > > >
> > > > "byggande av träd" -> "trädbygge" ?
> > >
> > > That sounds even weirder to me.
> >
> > Hmm, you may be right. Alternatives for "byggande" is
> > "konstruktion" and "skapande", don't know if either of those
> > make it sound better.
>
> Skriv om hel.
> Kunde inte bygga trädet.
trädet -> träden
However, to me "bygga" sounds like compile rather than create,
which is why I would prefer "konstruera" eller "skapa".
> > [cut]
> >
> > > >> +#: builtin/describe.c:205
> > > >> +#, c-format
> > > >> +msgid "annotated tag %s not available"
> > > >> +msgstr "den dekorerade taggen %s inte tillgänglig"
> > > >
> > > > "dekorerade" -> "annoterade"
> > >
> > > Is that a word?
> >
> > Yes. At least it is in SAOL which I think should be indicative
> > of its existence ;)
>
> Dekorerade låter konstigt. "annoterade" eller "kommenterade" funkar.
>
> > [cut]
> >
> > > >> +#: builtin/fetch.c:917
> > > >> +msgid "Fetching a group and specifying refspecs does not make sense"
> > > >> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> > > >
> > > > "från" -> "en" ?
> > >
> > > Well, I was thinking "fetch" -> "hämta från", and just dropped the
> > > "en".
> >
> > Ok.
>
> Ni byter mening. Den engelska texten antyder att det man försöker inte
> kan fungera, medan översättningen betyder att operationen inte lyckades
> den här gången.
>
> "Det är inte möjligt att hämta en grupp och samtidigt ange referensspecifikationer"
Could replace "Det är inte möjligt att" with "Kan inte" for a
shorter version.
> Jag lyfte medvetet bort idiotförklaringen av användaren.
>
> > [cut]
> >
> > > >> +#: builtin/grep.c:581
> > > >> +#, c-format
> > > >> +msgid "Failed to chdir: %s"
> > > >> +msgstr "Kunde inte byta katalog (chdir): %s"
> > > >
> > > > I think you can skip the " (chdir)" explanation without
> > > > loss of information.
> > >
> > > As long as the original string uses the system call reference, and not
> > > the action, I will keep it in the translation.
> >
> > Ok (guess the English message could do with an update...)
> >
> > > >> +#: builtin/grep.c:703
> > > >> +#, c-format
> > > >> +msgid "unable to grep from object of type %s"
> > > >> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> > > >
> > > > "\"grep\"" -> "greppa" ?
> > >
> > > That's a word that means something else... I don't really have any good
> > > idea on how to translate "grep" when used as a verb...
> >
> > Yeah, I know... I've no better suggestion I'm afraid.
>
> Varför ändra tempus? s/Kunde/Kan/. Som tidigare så handlar det inte
> om att greppandet misslyckades denna gång. Det /kan/ inte fungera nån
> gång (i denna version av Git). Dessutom är det inte viktigt om grep
> eller nån annan mekanism används.
>
> "Kan inte utföra textsökning i \"%s\"-objekt"
Sounds good to me. s/Kan/kan/ to maintain case.
[cut]
> > > >> +#: builtin/mv.c:206
> > > >> +#, c-format
> > > >> +msgid "Renaming %s to %s\n"
> > > >> +msgstr "Byter namn på %s till %s\n"
> > > >
> > > > "Byter namn på" -> "Döper om" ?
> > >
> > > I've used "byta namn" in other places, so if I change here, I should
> > > change it globally.
> >
> > Either should work I guess...
>
> Trenden är nog att alltmer använda religiösa termer enbart för
> religion. Titta i andra program så ser ni att "Byt namn..."
> oftast är det som används i menyer o.dyl. Däremot använder man
> ofta "döpa om" i talspråk.
Thanks for the explanation. That sounds like a good reason to
stick to "Byter namn".
> > [cut]
> >
> > > >> +#: builtin/push.c:77
> > > >> +#, c-format
> > > >> +msgid "The current branch %s is tracking multiple branches, refusing
> > > >> to push." +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar
> > > >> sända."
> > > >
> > > > "sända" -> "trycka iväg" ?
> > >
> > > "Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui
> > > translation of "Push". As long as git doesn't grow a "git send"
> > > command, I think that should be OK.
>
> Översättningarna i Git-gui är prejudicerande för denna översättning.
> Sen kanske de inte är 100%-aga heller, men i så fall bör både C Git
> och Git Gui ändras. Sen finns kanske ytterligare översättningar av
> andra Git-verktyg. Personligen föredrar jag nog Skicka. Absolut inte
> trycka.
Ok.
> > Ok.
> >
> > > >> +#: builtin/push.c:132
> > > >> +#, c-format
> > > >> +msgid ""
> > > >> +"To prevent you from losing history, non-fast-forward updates were rejected\n"
> > > >> +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
> > > >> +"'Note about fast-forwards' section of 'git push --help' for details.\n"
> > > >> +msgstr ""
> > > >> +"För att förhindra att du tappar historik har icke snabbspolande uppdateringar\n"
> > > >> +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder igen.\n"
> > > >> +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer.\n"
> > >
> > > > "icke snabbspolande" -> "icke-snabbspolande"
> > >
> > > Changed.
> > >
> > > > "t.ex" -> "t ex"
> > >
> > > I think it looks clearer with the full stop.
> >
> > Then it should be "t. ex." according to SAOL.
>
> Har inte senast upplagan, men jag tror inte det. Det skall vara "t ex"
> eller "t.ex." enligt Myndigheternas Skrivregler. Svenska Akademien
> använder "t.ex." på webben i alla fall (utan blank).
I stand corrected.
> > [cut
> >
> > > >> +#: builtin/reset.c:321
> > > >> +msgid "--mixed with paths is deprecated; use 'git reset --
> <paths>'
> > >
> > > instead."
> > >
> > > >> +msgstr "--mixed rekommenderas inte med sökvägar; använd \"git
> reset
> > >
> > > -- <sökvägar>\"."
> > >
> > > > "." -> " istället."
> > >
> > > I dropped it to fit an 80 character line.
> >
> > Ok.
> >
> > > >> +#: builtin/revert.c:270
> > > >> +#, c-format
> > > >> +msgid "Error wrapping up %s"
> > > >> +msgstr "Fel vid ombrytning av %s"
> > > >
> > > > I do not think this "wrapping up" refers to reformatting of the commit
> > > > message. I think it refers to finishing writing the message (a
> > > > rephrasing of the English message is advisable). Thus the Swedish
> > > > translation should probably be:
> > > >
> > > > "Fel vid avslutandet av %s"
> > >
> > > Are you sure about that? I was unable to figure it out when I looked at
> > > it.
> >
> > I am pretty sure. That error message is output in case a file
> > called "somefile.lock" cannot be closed and renamed to "somefile"
> > (see lockfile.c:commit_lock_file().)
>
> Felmeddelandet är inte vettigt på engelska heller. Kanske detta?
> "Kunde inte avsluta skrivning av filen %s"
Sounds ok to me.
> > [cut]
> >
> > > >> +#: builtin/shortlog.c:161
> > > >> +#, c-format
> > > >> +msgid "Missing author: %s"
> > > >> +msgstr "Saknad författare: %s"
> > > >
> > > > "Saknad" -> "Saknar"
> > >
> > > I think "missing" it is an adjective and not a verb here. The message
> > > is clear either way.
> >
> > Ok.
>
> Usch.
> "Författare saknas i: %s"
>
> Det funkar inte så bra att forkorta lika hårt som i engelska", därav
> det lilla "i"-et.
%s here is a SHA-1, so "för" may be better than "i"?
> > [cut]
> >
> > > >> +#: builtin/tag.c:196
> > > >> +msgid "gpg did not accept the tag data"
> > > >> +msgstr "gpg godtog inte taggdata"
> > > >
> > > > "taggdata" -> "taggdatan"
> > >
> > > "taggdatana" in that case. "data" is always plural.
>
> Innovativt :) Data är plural och singularform saknas (om
> man inte går tillbaka till latinets datum, men det är ingen
> som använder på svenska i den betydelsen).
>
> > Maybe better to use "tagginformationen"?
>
> Tag = etikett
Heh, probably some more places where tagg needs to be replaced
then... ;)
> "gpg accepterade inte etikettinformationen"
[cut]
> -- robin
//Peter
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 7:49 ` Peter Kjellerstedt
@ 2010-09-16 7:57 ` Jeremiah Foster
0 siblings, 0 replies; 24+ messages in thread
From: Jeremiah Foster @ 2010-09-16 7:57 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: Robin Rosenberg, Peter Krefting, Git, Swedish
On Sep 16, 2010, at 09:49, Peter Kjellerstedt wrote:
>>>>>
>>>>> "t.ex" -> "t ex"
>>>>
>>>> I think it looks clearer with the full stop.
>>>
>>> Then it should be "t. ex." according to SAOL.
>>
>> Har inte senast upplagan, men jag tror inte det. Det skall vara "t ex"
>> eller "t.ex." enligt Myndigheternas Skrivregler. Svenska Akademien
>> använder "t.ex." på webben i alla fall (utan blank).
Svenska Akademien? Pffft. What do they know? It's not like they give out the Noble Prize or anything.
Jeremiah
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [PATCH 2/2] Add Swedish translation.
2010-09-15 15:31 ` Peter Kjellerstedt
2010-09-15 22:46 ` Robin Rosenberg
@ 2010-09-16 10:41 ` Peter Krefting
2010-09-16 10:59 ` Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 24+ messages in thread
From: Peter Krefting @ 2010-09-16 10:41 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: Git, Swedish
Peter Kjellerstedt:
>>>> +#: builtin/commit.c:380
>>>> +msgid "cannot do a partial commit during a merge."
>>>> +msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
>>> "delvis" -> "partiell"
>> Is that better? Sounds a bit to technical to me.
> Well, "en delvis incheckning" doesn't sound like correct Swedish...
"Partiell" is something I connect with solar eclipses, can't say I can
remember hearing it much elsewhere. But any ideas for better wording are of
course appreciated.
>>>> +#: builtin/commit.c:737
>>>> +msgid "Error building trees"
>>>> +msgstr "Fel vid byggande av träd"
>>> "byggande av träd" -> "trädbygge" ?
>> That sounds even weirder to me.
> Hmm, you may be right. Alternatives for "byggande" is
> "konstruktion" and "skapande", don't know if either of those
> make it sound better.
Changing to "skapande", that sounds better IMHO.
>>> "dekorerade" -> "annoterade"
>> Is that a word?
> Yes. At least it is in SAOL which I think should be indicative of its
> existence ;)
I take your word (no pun intended) for it. Changing everywhere.
>>>> +#: builtin/log.c:825
>>>> +#, c-format
>>>> +msgid "insane in-reply-to: %s"
>>>> +msgstr "tokigt in-reply-to: %s"
>>> "tokigt" -> "tokig"
>> My sense of language says that it should be "neutrum", so "tokigt".
> Well, I read it with an implicit "header" (i.e., as "insane in-reply-to
> header: %s")...
Exactly. And "header" is "huvud", which is neuter.
>>>> +#: builtin/merge.c:651
>>>> +#, c-format
>>>> +msgid "Unknown option for merge-recursive: -X%s"
>>>> +msgstr "Felaktig flagga för merge-recursive: -X%s"
>>> "merge-recursive" -> "rekursiv ihopslagning" ?
>> No, merge-recursive is a name of a merge strategy.
> Maybe add quotes around it then do indicate that?
Added.
>>> "t.ex" -> "t ex"
>> I think it looks clearer with the full stop.
> Then it should be "t. ex." according to SAOL.
Yes, but then I overflow an 80 character line... :-/
>>>> +#: builtin/revert.c:270
>>>> +#, c-format
>>>> +msgid "Error wrapping up %s"
>>>> +msgstr "Fel vid ombrytning av %s"
>>> I do not think this "wrapping up" refers to reformatting of the commit
>>> message. I think it refers to finishing writing the message (a
>>> rephrasing of the English message is advisable). Thus the Swedish
>>> translation should probably be:
>>>
>>> "Fel vid avslutandet av %s"
>> Are you sure about that? I was unable to figure it out when I looked at
>> it.
> I am pretty sure. That error message is output in case a file called
> "somefile.lock" cannot be closed and renamed to "somefile" (see
> lockfile.c:commit_lock_file().)
Indeed. Fixed. Thanks for clarifying it.
>>>> +#: builtin/tag.c:196
>>>> +msgid "gpg did not accept the tag data"
>>>> +msgstr "gpg godtog inte taggdata"
>>> "taggdata" -> "taggdatan"
>> "taggdatana" in that case. "data" is always plural.
> Maybe better to use "tagginformationen"?
Yes. Much better! Thanks.
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 10:41 ` [PATCH 2/2] Add Swedish translation Peter Krefting
@ 2010-09-16 10:59 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-16 10:59 UTC (permalink / raw)
To: Peter Krefting; +Cc: Peter Kjellerstedt, Git, Swedish
On Thu, Sep 16, 2010 at 10:41, Peter Krefting <peter@softwolves.pp.se> wrote:
> Peter Kjellerstedt:
>>>> "t.ex" -> "t ex"
>>>
>>> I think it looks clearer with the full stop.
>>
>> Then it should be "t. ex." according to SAOL.
>
> Yes, but then I overflow an 80 character line... :-/
The English version fits in 3 lines, but you can use 4 or more if you
want.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-15 22:46 ` Robin Rosenberg
2010-09-16 7:49 ` Peter Kjellerstedt
@ 2010-09-16 11:23 ` Peter Krefting
2010-09-16 11:41 ` Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 24+ messages in thread
From: Peter Krefting @ 2010-09-16 11:23 UTC (permalink / raw)
To: Robin Rosenberg; +Cc: Peter Kjellerstedt, Git, Swedish
Robin Rosenberg:
>> Well, "en delvis incheckning" doesn't sound like correct Swedish...
> Håller med. "delvis incheckning" är inte svenska.
OK. Reluctantly changing to "partiell".
> (My comments are in swedish as it feels more natural in this context).
While I do agree, I'm trying to reply in English since the Git list is in
English.
> Skriv om hel.
> Kunde inte bygga trädet.
That does change the meaning. The original just reported that there was an
error while building it, the rewritten says building it failed. I'm not sure
there is actually any distinction here, but I'm trying to stick close to the
original meaning of the message (even if it might be wrong).
> Dekorerade låter konstigt. "annoterade" eller "kommenterade" funkar.
Changed.
>>>>> +#: builtin/fetch.c:917
>>>>> +msgid "Fetching a group and specifying refspecs does not make sense"
>>>>> +msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
> Ni byter mening. Den engelska texten antyder att det man försöker inte kan
> fungera, medan översättningen betyder att operationen inte lyckades den
> här gången.
>
> "Det är inte möjligt att hämta en grupp och samtidigt ange
> referensspecifikationer"
You are right, the translation can be misunderstood.
Shortening to "Det är inte möjligt att hämta från grupp och samtidigt ange
ref.specifikationer" to fit in under 80 characters (now 79...).
> Jag lyfte medvetet bort idiotförklaringen av användaren.
Of course the user is an idiot, I mean, the program itself is a git, so why
shouldn't the user be one too? :-)
>>>>> +#: builtin/grep.c:703
>>>>> +#, c-format
>>>>> +msgid "unable to grep from object of type %s"
>>>>> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
>>>> "\"grep\"" -> "greppa" ?
>>> That's a word that means something else... I don't really have any good
>>> idea on how to translate "grep" when used as a verb...
>> Yeah, I know... I've no better suggestion I'm afraid.
> Varför ändra tempus? s/Kunde/Kan/.
I read this as an understood "[The program was] unable to ...", and use this
form for all translation of incomplete sentences starting with "unable".
> "Kan inte utföra textsökning i \"%s\"-objekt"
Changing to "Kunde inte utföra textsökning (grep) från objekt av typen %s"
> "tokigt värde för \"in-reply-to\""
Trying to keep it short, as I don't know how long the value is.
>>> "Trycka iväg" sounds horrible, IMHO. I used "Sänd" in the git-gui
>>> translation of "Push". As long as git doesn't grow a "git send"
>>> command, I think that should be OK.
> Översättningarna i Git-gui är prejudicerande för denna översättning. Sen
> kanske de inte är 100%-aga heller, men i så fall bör både C Git och Git
> Gui ändras. Sen finns kanske ytterligare översättningar av andra
> Git-verktyg. Personligen föredrar jag nog Skicka. Absolut inte trycka.
Since I have done all the three translations (git-gui, gitk, git) I can
easily fix it in all once everyone agrees. Until then I stick with what I
have. :-)
> Myndigheternas Skrivregler. Svenska Akademien använder "t.ex." på webben i
> alla fall (utan blank).
Adding the extra "."; found out I do have space for it after all.
>>>>> +#, c-format
>>>>> +msgid "Missing author: %s"
>>>>> +msgstr "Saknad författare: %s"
> Usch.
> "Författare saknas i: %s"
Fixed.
> Tag = etikett
While I do agree, I have never heard anyone use "etikett" for a tag in the
computer science sense (neither a HTML tag nor a VCS tag). While "tagg" is
obviously horrible, I do use it in the translations simply because that is
what everyone else is using.
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 11:23 ` Peter Krefting
@ 2010-09-16 11:41 ` Ævar Arnfjörð Bjarmason
2010-09-16 13:58 ` Michael J Gruber
2010-09-16 17:09 ` Peter Krefting
0 siblings, 2 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-16 11:41 UTC (permalink / raw)
To: Peter Krefting; +Cc: Robin Rosenberg, Peter Kjellerstedt, Git, Swedish
On Thu, Sep 16, 2010 at 11:23, Peter Krefting <peter@softwolves.pp.se> wrote:
> Robin Rosenberg:
>> (My comments are in swedish as it feels more natural in this context).
>
> While I do agree, I'm trying to reply in English since the Git list is in
> English.
Usually yeah, but when a PO file is under discussion only people that
speak the language can contribute usefully anyway, so I think it's OK
if that discussion is not in English.
> Fixed.
>
>> Tag = etikett
>
> While I do agree, I have never heard anyone use "etikett" for a tag in the
> computer science sense (neither a HTML tag nor a VCS tag). While "tagg" is
> obviously horrible, I do use it in the translations simply because that is
> what everyone else is using.
FWIW mercurial uses märke, e.g.:
msgid ""
"The reserved name \"tip\" is a special tag that always identifies the\n"
"most recent revision."
msgstr ""
"Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
"identifierar den senaste revisionen."
and:
"denotes the tipmost revision of that branch. Tag and branch names must\n"
"not contain the \":\" character."
"anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
"innehålla tecknet \":\"."
and:
msgid "replace existing tag"
msgstr "ersätt existerande märke"
msgid "make the tag local"
msgstr "gör märket lokalt"
msgid "remove a tag"
msgstr "ta bort ett märke"
etc.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 11:41 ` Ævar Arnfjörð Bjarmason
@ 2010-09-16 13:58 ` Michael J Gruber
2010-09-16 14:02 ` Ævar Arnfjörð Bjarmason
2010-09-16 17:09 ` Peter Krefting
1 sibling, 1 reply; 24+ messages in thread
From: Michael J Gruber @ 2010-09-16 13:58 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Peter Krefting, Robin Rosenberg, Peter Kjellerstedt, Git, Swedish
Ævar Arnfjörð Bjarmason venit, vidit, dixit 16.09.2010 13:41:
> On Thu, Sep 16, 2010 at 11:23, Peter Krefting <peter@softwolves.pp.se> wrote:
>> Robin Rosenberg:
>>> (My comments are in swedish as it feels more natural in this context).
>>
>> While I do agree, I'm trying to reply in English since the Git list is in
>> English.
>
> Usually yeah, but when a PO file is under discussion only people that
> speak the language can contribute usefully anyway, so I think it's OK
> if that discussion is not in English.
How about "[L10N SE] etc." subject lines etc.? That way people can
easily filter out all L10N posts but keep those relevant to them
(including their language).
>
>> Fixed.
>>
>>> Tag = etikett
>>
>> While I do agree, I have never heard anyone use "etikett" for a tag in the
>> computer science sense (neither a HTML tag nor a VCS tag). While "tagg" is
>> obviously horrible, I do use it in the translations simply because that is
>> what everyone else is using.
>
> FWIW mercurial uses märke, e.g.:
>
> msgid ""
> "The reserved name \"tip\" is a special tag that always identifies the\n"
> "most recent revision."
> msgstr ""
> "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
> "identifierar den senaste revisionen."
>
> and:
>
> "denotes the tipmost revision of that branch. Tag and branch names must\n"
> "not contain the \":\" character."
>
> "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
> "innehålla tecknet \":\"."
>
> and:
>
> msgid "replace existing tag"
> msgstr "ersätt existerande märke"
>
> msgid "make the tag local"
> msgstr "gör märket lokalt"
>
> msgid "remove a tag"
> msgstr "ta bort ett märke"
>
> etc.
I'm trying to advocate "Marke" for DE ;)
In fact, subversion seems to be a good source for inspiration - at least
for the terms...
Michael
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 13:58 ` Michael J Gruber
@ 2010-09-16 14:02 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 24+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-16 14:02 UTC (permalink / raw)
To: Michael J Gruber
Cc: Peter Krefting, Robin Rosenberg, Peter Kjellerstedt, Git, Swedish
On Thu, Sep 16, 2010 at 13:58, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Ævar Arnfjörð Bjarmason venit, vidit, dixit 16.09.2010 13:41:
>> On Thu, Sep 16, 2010 at 11:23, Peter Krefting <peter@softwolves.pp.se> wrote:
>>> Robin Rosenberg:
>>>> (My comments are in swedish as it feels more natural in this context).
>>>
>>> While I do agree, I'm trying to reply in English since the Git list is in
>>> English.
>>
>> Usually yeah, but when a PO file is under discussion only people that
>> speak the language can contribute usefully anyway, so I think it's OK
>> if that discussion is not in English.
>
> How about "[L10N SE] etc." subject lines etc.? That way people can
> easily filter out all L10N posts but keep those relevant to them
> (including their language).
Sounds good, but convincing people to submit posts with those subjects
consistently is the hard part :)
> I'm trying to advocate "Marke" for DE ;)
> In fact, subversion seems to be a good source for inspiration - at least
> for the terms...
Yeah, languages that benefit from existing SCM translations should
definitely be looking at those, even if those SCM's aren't distributed
there's a lot of common vocabulary.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation.
2010-09-16 11:41 ` Ævar Arnfjörð Bjarmason
2010-09-16 13:58 ` Michael J Gruber
@ 2010-09-16 17:09 ` Peter Krefting
2010-09-16 19:18 ` [PATCH 2/2] Add Swedish translation. [in swedish] Robin Rosenberg
1 sibling, 1 reply; 24+ messages in thread
From: Peter Krefting @ 2010-09-16 17:09 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Robin Rosenberg, Peter Kjellerstedt, Git, Swedish
Ævar Arnfjörð Bjarmason:
> FWIW mercurial uses märke, e.g.:
I tried using that in a translation once, and no-one understood what I was
talking about. :-/
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/2] Add Swedish translation. [in swedish]
2010-09-16 17:09 ` Peter Krefting
@ 2010-09-16 19:18 ` Robin Rosenberg
0 siblings, 0 replies; 24+ messages in thread
From: Robin Rosenberg @ 2010-09-16 19:18 UTC (permalink / raw)
To: Peter Krefting
Cc: Ævar Arnfjörð Bjarmason, Peter Kjellerstedt, Git, Swedish
torsdagen den 16 september 2010 19.09.04 skrev Peter Krefting:
> Ævar Arnfjörð Bjarmason:
> > FWIW mercurial uses märke, e.g.:
> I tried using that in a translation once, and no-one understood what I was
> talking about. :-/
Label, [lejbl], tag (tagg), är de ord jag hört och använt så länge jag kan
minnas. Märken gör man genom att rispa, kladda med tusch. eller tappa saker.
En etikett är en prydlig märkning.
Termen etikett har jag aldrig behövt förklara för någon och ordet går att böja
utan att det låter konstigt, Å andra sidan kan "märka" användas eftersom man
märker upp saker med etiketter, snarare än att man "etiketterar" dem.
-- robin
^ permalink raw reply [flat|nested] 24+ messages in thread
* RE: [L10N SE] [PATCH 2/2] Add Swedish translation.
2010-09-15 10:24 ` Peter Krefting
2010-09-15 15:31 ` Peter Kjellerstedt
@ 2010-09-18 16:46 ` Göran Uddeborg
1 sibling, 0 replies; 24+ messages in thread
From: Göran Uddeborg @ 2010-09-18 16:46 UTC (permalink / raw)
To: Diskussioner om översättning till svenska
Cc: Peter Kjellerstedt, Git, Peter Krefting
Peter Krefting:
> Peter Kjellerstedt:
> >> +#: builtin/grep.c:703
> >> +#, c-format
> >> +msgid "unable to grep from object of type %s"
> >> +msgstr "Kunde inte \"grep\" från objekt av typen %s"
> > "\"grep\"" -> "greppa" ?
>
> That's a word that means something else... I don't really have any good idea
> on how to translate "grep" when used as a verb...
Probably best to rewrite as: köra grep
Då blir det tydligt att det är ett kommandonamn som avses.
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2010-09-18 17:05 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-12 20:10 [PATCH 2/2] Add Swedish translation Peter Krefting
2010-09-12 23:03 ` Ævar Arnfjörð Bjarmason
2010-09-13 7:15 ` Peter Krefting
2010-09-13 12:47 ` [PATCH] Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease Ævar Arnfjörð Bjarmason
2010-09-13 13:35 ` [PATCH 2/2] Add Swedish translation Ævar Arnfjörð Bjarmason
2010-09-13 13:45 ` Peter Krefting
2010-09-13 15:45 ` Ævar Arnfjörð Bjarmason
2010-09-14 8:25 ` Peter Krefting
2010-09-15 22:38 ` Ævar Arnfjörð Bjarmason
2010-09-13 10:12 ` Peter Kjellerstedt
2010-09-15 10:24 ` Peter Krefting
2010-09-15 15:31 ` Peter Kjellerstedt
2010-09-15 22:46 ` Robin Rosenberg
2010-09-16 7:49 ` Peter Kjellerstedt
2010-09-16 7:57 ` Jeremiah Foster
2010-09-16 11:23 ` Peter Krefting
2010-09-16 11:41 ` Ævar Arnfjörð Bjarmason
2010-09-16 13:58 ` Michael J Gruber
2010-09-16 14:02 ` Ævar Arnfjörð Bjarmason
2010-09-16 17:09 ` Peter Krefting
2010-09-16 19:18 ` [PATCH 2/2] Add Swedish translation. [in swedish] Robin Rosenberg
2010-09-16 10:41 ` [PATCH 2/2] Add Swedish translation Peter Krefting
2010-09-16 10:59 ` Ævar Arnfjörð Bjarmason
2010-09-18 16:46 ` [L10N SE] " Göran Uddeborg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.