diff -r 96232974dcdb -r 645c12de6b0c Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py --- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sun Mar 30 22:00:14 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Thu Apr 03 23:05:31 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_WARNING__ -except (NameError): + str = unicode +except NameError: pass import os.path @@ -86,14 +86,14 @@ self.process.finished.connect(self.__finish) self.setWindowTitle( - self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) + self.tr('{0} - {1}').format(self.cmdname, self.filename)) self.process.start(program, args) procStarted = self.process.waitForStarted(5000) if not procStarted: E5MessageBox.critical( self, - self.trUtf8('Process Generation Error'), - self.trUtf8( + self.tr('Process Generation Error'), + self.tr( 'The process {0} could not be started. ' 'Ensure, that it is in the search path.' ).format(program)) @@ -130,7 +130,7 @@ self.process = None self.contents.insertPlainText( - self.trUtf8('\n{0} finished.\n').format(self.cmdname)) + self.tr('\n{0} finished.\n').format(self.cmdname)) self.contents.ensureCursorVisible() def __readStdout(self):