--- a/E5Gui/E5ToolBarDialog.py Fri Jan 10 19:30:21 2014 +0100 +++ b/E5Gui/E5ToolBarDialog.py Sat Jan 11 11:55:33 2014 +0100 @@ -78,7 +78,7 @@ self.__resetButton = self.buttonBox.button(QDialogButtonBox.Reset) self.actionsTree.header().hide() - self.__separatorText = self.trUtf8("--Separator--") + self.__separatorText = self.tr("--Separator--") itm = QTreeWidgetItem(self.actionsTree, [self.__separatorText]) self.actionsTree.setCurrentItem(itm) @@ -133,16 +133,16 @@ """ name, ok = QInputDialog.getText( self, - self.trUtf8("New Toolbar"), - self.trUtf8("Toolbar Name:"), + self.tr("New Toolbar"), + self.tr("Toolbar Name:"), QLineEdit.Normal) if ok and name: if self.toolbarComboBox.findText(name) != -1: # toolbar with this name already exists E5MessageBox.critical( self, - self.trUtf8("New Toolbar"), - self.trUtf8( + self.tr("New Toolbar"), + self.tr( """A toolbar with the name <b>{0}</b> already""" """ exists.""") .format(name)) @@ -166,8 +166,8 @@ name = self.toolbarComboBox.currentText() res = E5MessageBox.yesNo( self, - self.trUtf8("Remove Toolbar"), - self.trUtf8( + self.tr("Remove Toolbar"), + self.tr( """Should the toolbar <b>{0}</b> really be removed?""") .format(name)) if res: @@ -191,8 +191,8 @@ oldName = self.toolbarComboBox.currentText() newName, ok = QInputDialog.getText( self, - self.trUtf8("Rename Toolbar"), - self.trUtf8("New Toolbar Name:"), + self.tr("Rename Toolbar"), + self.tr("New Toolbar Name:"), QLineEdit.Normal, oldName) if ok and newName: @@ -202,8 +202,8 @@ # toolbar with this name already exists E5MessageBox.critical( self, - self.trUtf8("Rename Toolbar"), - self.trUtf8( + self.tr("Rename Toolbar"), + self.tr( """A toolbar with the name <b>{0}</b> already""" """ exists.""") .format(newName))