--- a/RefactoringRope/HistoryDialog.py Sun Jul 06 14:17:24 2014 +0200 +++ b/RefactoringRope/HistoryDialog.py Sun Jul 06 14:27:51 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt5.QtCore import Qt, pyqtSlot -from PyQt5.QtWidgets import QDialogButtonBox, QListWidgetItem, QApplication +from PyQt4.QtCore import Qt, pyqtSlot +from PyQt4.QtGui import QDialogButtonBox, QListWidgetItem, QApplication from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -44,16 +44,16 @@ if self.__isUndo: self.__actionButton = self.buttonBox.addButton( - self.tr("&Undo"), + self.trUtf8("&Undo"), QDialogButtonBox.AcceptRole) - self.description.setText(self.tr("Undoable Changes")) - title = self.tr("Undo History") + self.description.setText(self.trUtf8("Undoable Changes")) + title = self.trUtf8("Undo History") else: self.__actionButton = self.buttonBox.addButton( - self.tr("&Redo"), + self.trUtf8("&Redo"), QDialogButtonBox.AcceptRole) - self.description.setText(self.tr("Redoable Changes")) - title = self.tr("Redo History") + self.description.setText(self.trUtf8("Redoable Changes")) + title = self.trUtf8("Redo History") self.buttonBox.addButton(QDialogButtonBox.Close) self.setWindowTitle(title) @@ -98,16 +98,16 @@ if self.__isUndo: res = E5MessageBox.yesNo( None, - self.tr("Undo refactorings"), - self.tr("""Shall all refactorings up to <b>{0}</b>""" - """ be undone?""") + self.trUtf8("Undo refactorings"), + self.trUtf8("""Shall all refactorings up to <b>{0}</b>""" + """ be undone?""") .format(Utilities.html_encode(str(change)))) else: res = E5MessageBox.yesNo( None, - self.tr("Redo refactorings"), - self.tr("""Shall all refactorings up to <b>{0}</b>""" - """ be redone?""") + self.trUtf8("Redo refactorings"), + self.trUtf8("""Shall all refactorings up to <b>{0}</b>""" + """ be redone?""") .format(Utilities.html_encode(str(change)))) if res: if not self.__refactoring.confirmAllBuffersSaved():