[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: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-05-01 14:58:21 CEST

plasma writes:
>
> I have not been active on translating subverion.po for a long time,
> and currently I decided to clean the Traditional Chinese version up.
>
> 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.

> 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.

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 1 14:58:48 2006

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