[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [l10n] Merging changes from trunk to branch

From: plasma <plasma_at_ms9.hinet.net>
Date: 2006-05-01 17:07:16 CEST

On Mon, May 01, 2006 at 02:58:21PM +0200, Peter N. Lundblad wrote:
> plasma writes:
> > I have done fuzzy messages and new messages on trunk, and commit them
> > back. But after I ran 'make locale-gnu-po-update' and po-merge.py, I
> > found there are still fuzzy messages. After reading TRANSLATING file,
> > it says I can translate messages which never existed on trunk, and
> > tweak message options. But I'm not sure if I can touch fuzzy
> > messages.
>
> Do I understand correctly if I claim that you first ran locale-gnu-po-update
> and then po-merge.py on the branch? If so, and there are still things
> that need to be done on the branch, just do them. I usually commit
> after locale-gnu-po-update to improve reviewability of the translation changes.

Yes, the order is correct. So I'll just do what I must do with these
messages. Thanx.

> > And about the untranslated messages. I found some of them do exist on
> > trunk, but with a different path, like:
> >
> > # 1.3.x Branch
> > #: clients/cmdline/copy-cmd.c:106 clients/cmdline/delete-cmd.c:64
> > #: clients/cmdline/mkdir-cmd.c:66
> > msgid "Local, non-commit operations do not take a log message"
> > msgstr ""
> >
> > # trunk branch
> > #: svn/copy-cmd.c:108 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
> > msgid "Local, non-commit operations do not take a log message"
> > msgstr "**TRANSLATED MESSAGE**"
> >
>
> Hmmm, po-merge.py just cares about the msgid, not the location info,
> so I don't understand hot that can happen. Maybe worth more
> investigation.

My guess was the location info should not matter, but I'm not sure
about it. If any one is interested, the merge source is
trunk/subversion/po/zh_TW.po@r19477, the branch is
branches/1.3.x@r19375.

plasma

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 1 17:08:04 2006

This is an archived mail posted to the Subversion Dev mailing list.