Index: make-messages.py
===================================================================
--- make-messages.py	(revision 5726)
+++ make-messages.py	(working copy)
@@ -117,6 +117,7 @@
                         old = '#: '+os.path.join(dirpath, thefile)[2:]
                         new = '#: '+os.path.join(dirpath, file)[2:]
                         msgs = msgs.replace(old, new)
+                    msgs = msgs.replace(chr(13), '')
                     if os.path.exists(potfile):
                         # Strip the header
                         msgs = '\n'.join(dropwhile(len, msgs.split('\n')))