![](https://secure.gravatar.com/avatar/01aa7d6d4db83982a2f6dd363d0ee0f3.jpg?s=120&d=mm&r=g)
"DT" == Danny Terweij <danny@terweij.nl> writes:
>> 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: >> http://www.cvshome.org/docs/manual/cvs_10.html#SEC86 DT> Well, this is what i do : Get the latest CVS version. Copy DT> the mailman.po to /tmp/vertaal.po and i edit vertaal.po for DT> translations. (I am editing with the Crimson Editor (win32)) DT> Then i do : msgfmt vertaal.po cp vertaal.po DT> /usr/local/mailman/messages/nl/LC_MESSAGES/mailman.po cp DT> messages.mo DT> /usr/local/mailman/messages/nl/LC_MESSAGES/mailman.mo DT> But when a big change occurs at the CVS version then i do not DT> know how to merge it.. (if there is a way). DT> Maybe i do this at a wrong way.. but it works fine for me DT> (till big changes as now). It's the "big changes" that are exactly the reason why you probably want to edit mailman.po in its cvs location. Those big changes usually boil down to easily resolvable differences that cvs can automatically merge for you. -Barry