Re: [PATCH] Update Japanese translation

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 15, 2008, 05:51 UTC
Message-ID: <7vlk4ko7px.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080315050840.GF8410@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

Show 10 quoted lines

>>  "Report-Msgid-Bugs-To: \n"
>> -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
>> -"PO-Revision-Date: 2007-12-05 06:12+0900\n"
>> +"POT-Creation-Date: 2008-02-16 21:24+0100\n"
>> +"PO-Revision-Date: 2008-03-14 20:32+0900\n"
>
> Unfortunately this patch does not apply after Peter's regeneration
> of the POT file (0212242d66):
>
>   "POT-Creation-Date: 2008-03-14 07:18+0100\n"

Here is the guide to your translators, in your po/README:

    By comparing "POT-Creation-Date:" line in po/git-gui.pot file and
    po/af.po file, you can tell if there are new messages that need to be
    translated.  You would need the GNU gettext package to perform this
    step.

            $ msgmerge -U po/af.po po/git-gui.pot

    [NEEDSWORK: who is responsible for updating po/git-gui.pot file by
    running xgettext?  IIRC, Christian recommended against running it
    nilly-willy because it can become a source of unnecessary merge
    conflicts.  Perhaps we should mention something like "

    The po/git-gui.pot file is updated by the internationalization
    coordinator from time to time.  You _could_ update it yourself, but
    translators are discouraged from doing so because we would want all
    language teams to be working off of the same version of git-gui.pot.

    " here?]

Shawn, I think you guys should nail down the workflow right first, and then mention the above a bit more prominently to avoid future accidents like this.

It is perfectly fine if Peter regenerated the POT file for everybody as the i18n coordinator, but the thing is, I think that regeneration should have been done *before* you asked for translators to send in the translation updates, not _after_ they have fetched from you in response to your call for help and started working.

Probably it would be the easiest to reduce unnecessary work from translators, if you just applied the patch to the version _before_ re-generation of POT, then msgmerge the updated POT after that.

It appears the patch was done on top of 48ed49f, so I would imagine a sensible approach would be for _you_ to do:

    $ git checkout 48ed49f
    $ git am -s ja.patch
    $ git checkout master
    $ git checkout HEAD@{1} po/ja.po
    $ git commit -a -C HEAD@{1}
    $ msgmerge -U po/ja.po po/git-gui.pot
    $ git commit -m 'Adjusted older translation to updated POT' po/ja.po

Then ask Nana to re-fetch and fix that up. At least that would reduce the need for re-translation.