=== modified file 'src/calibre/gui2/__init__.py'
--- src/calibre/gui2/__init__.py 2012-11-26 06:10:52 +0000
+++ src/calibre/gui2/__init__.py 2012-12-15 18:45:46 +0000
@@ -1034,7 +1034,9 @@
dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
dat = dat.replace('from convert.xpath_wizard import',
'from calibre.gui2.convert.xpath_wizard import')
- dat = re.compile(r'QtGui.QApplication.translate\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
+ dat = re.sub(r'^ {4}def _translate\(.+:\s+return.*$', ' pass', dat,
+ flags=re.M)
+ dat = re.compile(r'(?:QtGui.QApplication.translate|(?<!def )_translate)\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
dat = dat.replace('_("MMM yyyy")', '"MMM yyyy"')
dat = pat.sub(sub, dat)
dat = dat.replace('from QtWebKit.QWebView import QWebView',