[Plone-i18n] Re: Re: Problem with Wednesday merge

[Daniel N. <dan...@co...>]

On Sun, 25 Jan 2004 11:39:44 +0100, Jan Ulrich Hasecke 
<jan...@we...> wrote:

> Mh, I am not used to cvs. What does this mean? Maybe a warning,
> because I edited the files in the meantime?
>
> RCS file: /cvsroot/plone-i18n/i18n/plone-de.po,v
> retrieving revision 1.24
> retrieving revision 1.25
> Merging differences between 1.24 and 1.25 into plone-de.po
> rcsmerge: warning: conflicts during merge
> cvs update: conflicts found in plone-de.po
> C plone-de.po
> U plone-en.po
> RCS file: /cvsroot/plone-i18n/i18n/plone-eo.po,v
> retrieving revision 1.10
> retrieving revision 1.11
> Merging differences between 1.10 and 1.11 into plone-eo.po
> rcsmerge: warning: conflicts during merge
> cvs update: conflicts found in plone-eo.po

Yes. That's because you edited the file in the meantime. I
would suggest you download[1] i18ndude and run

i18ndude.py admix <revision from CVS> <your version>

This will add to <revision from CVS> the messages that are
untranslated but are translated in <your version>.

Note that you will need your original versions, not the ones
that CVS tried to merge.

HTH,

[1] http://prdownloads.sourceforge.net/plone-i18n/i18ndude.tgz?download
-- 
Daniel Nouri