diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 8c3f24cfb1..5667a3ca9b 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -1588,7 +1588,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 d = error_dialog(self, _('Conversion Error'),
                     _('<p>Could not convert: %s<p>It is a '
                       '<a href="%s">DRM</a>ed book. You must first remove the '
-                      'DRM using 3rd party tools.')%\
+                      'DRM using third party tools.')%\
                         (job.description.split(':')[-1],
                             'http://wiki.mobileread.com/wiki/DRM'))
                 d.setModal(False)
diff --git a/upload.py b/upload.py
index 4467a44d9d..599c59d6bc 100644
--- a/upload.py
+++ b/upload.py
@@ -296,9 +296,9 @@ class get_translations(translations):
                 yield line
 
     def run(self):
-        if len(list(self.modified_translations)) == 0:
+        if len(list(self.modified_translations())) == 0:
             subprocess.check_call(['bzr', 'merge', self.BRANCH])
-        if len(list(self.modified_translations)) == 0:
+        if len(list(self.modified_translations())) == 0:
             print 'No updated translations available'
         else:
             subprocess.check_call(['bzr', 'commit', '-m',
@@ -315,17 +315,32 @@ class get_translations(translations):
                 '-t', 'accelerators', '-t', 'escapes', '-t', 'variables',
                 #'-t', 'xmltags',
                 #'-t', 'brackets',
-                '-t', 'emails',
+                #'-t', 'emails',
                 #'-t', 'doublequoting',
                 #'-t', 'filepaths',
                 '-t', 'numbers',
                 '-t', 'options',
-                '-t', 'urls',
+                #'-t', 'urls',
                 '-t', 'printf')
         subprocess.check_call(pofilter)
-        #for err in os.listdir(errors):
-        #    subprocess.check_call(['gvim', os.path.join(errors, err)])
-        #subprocess.check_call(['pomerge', '-t', cls.PATH,
+        errfiles = glob.glob(errors+os.sep+'*.po')
+        subprocess.check_call(['gvim', '-p', '--']+errfiles)
+        for f in errfiles:
+            with open(f, 'r+b') as f:
+                raw = f.read()
+                raw = re.sub(r'# \(pofilter\).*', '', raw)
+                f.seek(0)
+                f.truncate()
+                f.write(raw)
+
+        subprocess.check_call(['pomerge', '-t', cls.PATH, '-i', errors, '-o',
+            cls.PATH])
+        if len(list(cls.modified_translations())) > 0:
+            subprocess.call(['bzr', 'diff', cls.PATH])
+            yes = raw_input('Merge corrections? [y/n]: ').strip()
+            if yes in ['', 'y']:
+                subprocess.check_call(['bzr', 'commit', '-m',
+                    'IGN:Translation corrections', cls.PATH])
 
 class gui(OptionlessCommand):
     description='''Compile all GUI forms and images'''