Re: [i18n] Last mile patch for es.po

>I translated the trunk es.po
>Hope it's not too different from the 1.1.x es.po :-(

Oops... my fault! The patch works (I had to apply manually the last
chunk).

I'm trying to use 'msgmerge' to create a patch for 1.1.x based on
your patch from trunk, but I still didn't have success.

The problem here is that merges from trunk to branches of PO files
generate too much conflicts. Here are the steps that I tried:

  1) apply Ariel's patch to es.po file;
  2) run locale update on trunk;
  3) run locale update on branch;
  4) bring latest trunk changes to branch using 'msgmerge';
  5) run locale update on branch again;

Now I'm not sure if this is the way to go to solve this problem.

Does anybody have better ideas? Direct commit on branch is against
this project's policies (not to mention that it's sooooo boring to
apply the same changes twice).

_________________________________________________________________
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 Mon Sep 27 22:07:18 2004