[Mailman-i18n] Help with Latest changes

Barry A. Warsaw barry@python.org
Tue Oct 29 21:20:21 2002

>>>>> "DT" == Danny Terweij <danny@terweij.nl> writes:

    DT> I see (new checkins) that many lines are changed at the
    DT> mailman.po file (Bouncer Patch).  How to merge the new
    DT> mailman.po(latest cvs b4+) with my mailman-work.po(b4) ?  I
    DT> did serveral translations and i do not want it to be lost :(

Did you get CVS conflicts?  Hopefully if so you didn't get a lot of
them, but if you did you'll need to resolve them manually in an
editor.  Here's an entry from the cvs manual that helps explain the
process of resolving conflicts: