From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: しらいしななこ <nanako3@bluebottle.com>, git@vger.kernel.org
Subject: Re: [PATCH] Update Japanese translation
Date: Sat, 15 Mar 2008 02:27:35 -0400 [thread overview]
Message-ID: <20080315062734.GG8410@spearce.org> (raw)
In-Reply-To: <7vlk4ko7px.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
>
> >> "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:
> $ msgmerge -U po/af.po po/git-gui.pot
Gah, I forgot about that.
> 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.
Yes. I clearly dropped the ball on that one. I did try by asking
for assistance _before_ a tagged release, but I failed to make sure
the POT was up to date first.
> 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
...
> $ msgmerge -U po/ja.po po/git-gui.pot
> $ git commit -m 'Adjusted older translation to updated POT' po/ja.po
Done, and now on repo.or.cz, master branch. I did actually try to
go back to that version, apply it, and merge it forward, but I forgot
about msgmerge as a means of dealing with a conflicted PO file.
> Then ask Nana to re-fetch and fix that up. At least that would reduce the
> need for re-translation.
Nana, hopefully a re-fetch will be easier to fix up. :)
--
Shawn.
next prev parent reply other threads:[~2008-03-15 6:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-14 13:03 [PATCH] Update Japanese translation しらいしななこ
2008-03-14 22:25 ` [PATCH] git-gui: update russian translation Alex Riesen
2008-03-15 5:08 ` [PATCH] Update Japanese translation Shawn O. Pearce
2008-03-15 5:51 ` Junio C Hamano
2008-03-15 6:27 ` Shawn O. Pearce [this message]
2008-03-15 7:43 ` Junio C Hamano
2008-03-16 4:25 ` Shawn O. Pearce
2008-03-16 5:46 ` Junio C Hamano
2008-03-16 13:08 ` Peter Karlsson
2008-03-15 11:12 ` しらいしななこ
-- strict thread matches above, loose matches on Subject: below --
2015-11-03 12:47 [PATCH] Update japanese translation miurahr
2015-11-03 20:40 ` Junio C Hamano
2015-11-06 14:36 ` Hiroshi Miura
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080315062734.GG8410@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@bluebottle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).