--- a/Helpviewer/History/HistoryMenu.py Fri Jan 10 19:30:21 2014 +0100 +++ b/Helpviewer/History/HistoryMenu.py Sat Jan 11 11:55:33 2014 +0100 @@ -274,7 +274,7 @@ self.__initialActions = [] self.__mostVisitedMenu = None - self.__closedTabsMenu = QMenu(self.trUtf8("Closed Tabs")) + self.__closedTabsMenu = QMenu(self.tr("Closed Tabs")) self.__closedTabsMenu.aboutToShow.connect( self.__aboutToShowClosedTabsMenu) self.__tabWidget.closedTabsManager().closedTabAvailable.connect( @@ -332,7 +332,7 @@ if self.__mostVisitedMenu is None: self.__mostVisitedMenu = HistoryMostVisitedMenu(10, self) - self.__mostVisitedMenu.setTitle(self.trUtf8("Most Visited")) + self.__mostVisitedMenu.setTitle(self.tr("Most Visited")) self.__mostVisitedMenu.openUrl.connect(self.openUrl) self.__mostVisitedMenu.newUrl.connect(self.newUrl) self.addMenu(self.__mostVisitedMenu) @@ -342,10 +342,10 @@ self.addSeparator() act = self.addAction(UI.PixmapCache.getIcon("history.png"), - self.trUtf8("Show All History...")) + self.tr("Show All History...")) act.triggered[()].connect(self.__showHistoryDialog) act = self.addAction(UI.PixmapCache.getIcon("historyClear.png"), - self.trUtf8("Clear History...")) + self.tr("Clear History...")) act.triggered[()].connect(self.__clearHistoryDialog) def setInitialActions(self, actions): @@ -376,8 +376,8 @@ """ if self.__historyManager is not None and E5MessageBox.yesNo( self, - self.trUtf8("Clear History"), - self.trUtf8("""Do you want to clear the history?""")): + self.tr("Clear History"), + self.tr("""Do you want to clear the history?""")): self.__historyManager.clear() def __aboutToShowClosedTabsMenu(self): @@ -398,10 +398,10 @@ index += 1 self.__closedTabsMenu.addSeparator() self.__closedTabsMenu.addAction( - self.trUtf8("Restore All Closed Tabs"), + self.tr("Restore All Closed Tabs"), self.__tabWidget.restoreAllClosedTabs) self.__closedTabsMenu.addAction( - self.trUtf8("Clear List"), + self.tr("Clear List"), self.__tabWidget.clearClosedTabsList) def __closedTabAvailable(self, avail):