[Mailman-i18n] Help with Latest changes

[Martin von Loewis]

> So my edit file is deleted and replaced with cvs version?

Yes.

> Maybe i still do something wrong :)

It's too late now. CVS merging would only work if you already have a sandbox.
When checking out a fresh copy, no merging is done.

So you should have checked out the CVS sandbox a month ago, and should have 
performed a cvs update now.

You still can reproduce the sequence of actions, by:

- checking out an old tree, with 'cvs co -D"last month" mailman',
- copying your .po file over the CVS one,
- updating to the current tree, with 'cvs up -A' (-A to remove the date
  tag)

"last month" might be incorrect, since you really need to get the CVS state
which you used to produce your current PO file.

Regards,
Martin