--- a/mercurial/i18n.py	Tue Jun 15 13:04:22 2010 -0400
+++ b/mercurial/i18n.py	Sat Jun 19 19:16:11 2010 +0200
@@ -36,7 +36,10 @@
     if message is None:
         return message
 
-    u = u'\n\n'.join([t.ugettext(m) for m in message.split('\n\n')])
+    paragraphs = message.split('\n\n')
+    # Be careful not to translate the empty string -- it holds the
+    # meta data of the .po file.
+    u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
     try:
         # encoding.tolocal cannot be used since it will first try to
         # decode the Unicode string. Calling u.decode(enc) really