Re: Translation maintenance requires direct branch commits. (Doesn't it?)

>I decided to always work on branch and once 1.1 is out of the door to
>catch up on trunk afterwards. I found it quite annoying to fix/merge
>tiny spelling corrections twice.

What about working only on trunk and then copying trunk's PO file
over the PO file on branch? If the obsolete messages in trunk's PO
file are never removed, they will be used when locale update
(msgmerge) is run in the branch. This idea works, for example, if we
apply Ariel's spanish translation patch
(http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=78122)
in trunk and then copy the patched file from trunk to the 1.1.x
branch.

Some attempts without good results (but maybe someone else can think
of better approaches based on these):

  - to use 'msgmerge' instead of 'svn merge' to merge changes of PO
    files;
  - run xgettext with the '--no-location' switch to avoid merge
    conflicts of the '#: filename:line' lines;

Marcos

_________________________________________________________________
MSN Messenger: converse com os seus amigos online.
http://messenger.msn.com.br

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 28 02:01:42 2004