Helge Hafting <[EMAIL PROTECTED]> writes: > Sorry, I forgot to "svn update" before making the diff. > > This one will hopefully work better.
Not really, it contains svn conflict marks like: +<<<<<<< .mine +"POT-Creation-Date: 2007-10-30 15:38+0100\n" +"PO-Revision-Date: 2007-11-13 01:35+0100\n" +======= "POT-Creation-Date: 2007-11-11 19:00+0100\n" "PO-Revision-Date: 2007-06-01 12:45+0200\n" +>>>>>>> .r21576 JMarc
