From: Ævar Arnfjörð Bjarmason Date: Mon, 13 Sep 2010 13:35:59 GMT Subject: Re: [PATCH 2/2] Add Swedish translation. Message-ID: In-Reply-To: On Mon, Sep 13, 2010 at 07:15, Peter Krefting 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 Krefting , 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 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 \n" >>       -"Language-Team: Swedish \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 ": " convention. All the existing commits in ab/i18n use that convention, and I'd prefer to keep it that way.