diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index 414deb135f..83008829fb 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -607,27 +607,21 @@ const char * Command::endCmdHelp(void)
 void Command::applyCommandData(const char* context, Action* action)
 {
     action->setText(QCoreApplication::translate(
-        context, getMenuText(), 0,
-        QCoreApplication::UnicodeUTF8));
+        context, getMenuText()));
     action->setToolTip(QCoreApplication::translate(
-        context, getToolTipText(), 0,
-        QCoreApplication::UnicodeUTF8));
+        context, getToolTipText()));
     if (sStatusTip)
         action->setStatusTip(QCoreApplication::translate(
-            context, getStatusTip(), 0,
-            QCoreApplication::UnicodeUTF8));
+            context, getStatusTip()));
     else
         action->setStatusTip(QCoreApplication::translate(
-            context, getToolTipText(), 0,
-            QCoreApplication::UnicodeUTF8));
+            context, getToolTipText()));
     if (sWhatsThis)
         action->setWhatsThis(QCoreApplication::translate(
-            context, getWhatsThis(), 0,
-            QCoreApplication::UnicodeUTF8));
+            context, getWhatsThis()));
     else
         action->setWhatsThis(QCoreApplication::translate(
-            context, getToolTipText(), 0,
-            QCoreApplication::UnicodeUTF8));
+            context, getToolTipText()));
     QString accel = action->shortcut().toString(QKeySequence::NativeText);
     if (!accel.isEmpty()) {
         // show shortcut inside tooltip
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index 08e76fd5d8..829b8d1e00 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -196,14 +196,11 @@ Action * StdCmdAbout::createAction(void)
     QString exe = qApp->applicationName();
     pcAction = new Action(this,getMainWindow());
     pcAction->setText(QCoreApplication::translate(
-        this->className(), sMenuText, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sMenuText).arg(exe));
     pcAction->setToolTip(QCoreApplication::translate(
-        this->className(), sToolTipText, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sToolTipText).arg(exe));
     pcAction->setStatusTip(QCoreApplication::translate(
-        this->className(), sStatusTip, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sStatusTip).arg(exe));
     pcAction->setWhatsThis(QLatin1String(sWhatsThis));
     pcAction->setIcon(QApplication::windowIcon());
     pcAction->setShortcut(QString::fromLatin1(sAccel));
@@ -234,14 +231,11 @@ void StdCmdAbout::languageChange()
     if (_pcAction) {
         QString exe = qApp->applicationName();
         _pcAction->setText(QCoreApplication::translate(
-            this->className(), sMenuText, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sMenuText).arg(exe));
         _pcAction->setToolTip(QCoreApplication::translate(
-            this->className(), sToolTipText, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sToolTipText).arg(exe));
         _pcAction->setStatusTip(QCoreApplication::translate(
-            this->className(), sStatusTip, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sStatusTip).arg(exe));
         _pcAction->setWhatsThis(QLatin1String(sWhatsThis));
     }
 }
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index 62b0d64be9..8b2adf43ec 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -615,39 +615,29 @@ void StdCmdDrawStyle::languageChange()
     QList<QAction*> a = pcAction->actions();
 
     a[0]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "As is", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "As is"));
     a[0]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Normal mode", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Normal mode"));
 
     a[1]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Flat lines", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Flat lines"));
     a[1]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Flat lines mode", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Flat lines mode"));
 
     a[2]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Shaded", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Shaded"));
     a[2]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Shaded mode", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Shaded mode"));
 
     a[3]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Wireframe", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Wireframe"));
     a[3]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Wireframe mode", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Wireframe mode"));
 
     a[4]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Points", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Points"));
     a[4]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Points mode", 0,
-        QCoreApplication::CodecForTr));
+        "Std_DrawStyle", "Points mode"));
 }
 
 void StdCmdDrawStyle::updateIcon(const MDIView *view)
@@ -1453,8 +1443,7 @@ Action * StdViewDockUndockFullscreen::createAction(void)
     ActionGroup* pcAction = new ActionGroup(this, getMainWindow());
     pcAction->setDropDownMenu(true);
     pcAction->setText(QCoreApplication::translate(
-        this->className(), sMenuText, 0,
-        QCoreApplication::CodecForTr));
+        this->className(), sMenuText));
 
     CommandManager &rcCmdMgr = Application::Instance->commandManager();
     Command* cmdD = rcCmdMgr.getCommandByName("Std_ViewDock");
diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp
index d6ca4bfde3..ec0e882ff4 100644
--- a/src/Gui/CommandWindow.cpp
+++ b/src/Gui/CommandWindow.cpp
@@ -440,14 +440,11 @@ Action * StdCmdWindowsMenu::createAction(void)
         QAction* window = pcAction->addAction(QObject::tr(sToolTipText));
         window->setCheckable(true);
         window->setToolTip(QCoreApplication::translate(
-            this->className(), sToolTipText, 0,
-            QCoreApplication::CodecForTr));
+            this->className(), sToolTipText));
         window->setStatusTip(QCoreApplication::translate(
-            this->className(), sStatusTip, 0,
-            QCoreApplication::CodecForTr));
+            this->className(), sStatusTip));
         window->setWhatsThis(QCoreApplication::translate(
-            this->className(), sWhatsThis, 0,
-            QCoreApplication::CodecForTr));
+            this->className(), sWhatsThis));
     }
 
     QAction* sep = pcAction->addAction(QLatin1String(""));
diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/DlgKeyboardImp.cpp
index c3f4f34e44..8e547c2957 100644
--- a/src/Gui/DlgKeyboardImp.cpp
+++ b/src/Gui/DlgKeyboardImp.cpp
@@ -226,7 +226,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
         // update the tool tip
         QString accel = shortcut.toString(QKeySequence::NativeText);
         QString toolTip = QCoreApplication::translate(cmd->className(),
-            cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
+            cmd->getToolTipText());
         if (!accel.isEmpty()) {
             if (!toolTip.isEmpty()) {
                 QString tip = QString::fromLatin1("%1 (%2)")
@@ -240,7 +240,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
 
         // update the status tip
         QString statusTip = QCoreApplication::translate(cmd->className(),
-            cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
+            cmd->getStatusTip());
         if (statusTip.isEmpty())
             statusTip = toolTip;
         if (!accel.isEmpty()) {
@@ -281,12 +281,12 @@ void DlgCustomKeyboardImp::on_buttonClear_clicked()
 
         // update the tool tip
         QString toolTip = QCoreApplication::translate(cmd->className(),
-            cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
+            cmd->getToolTipText());
         action->setToolTip(toolTip);
 
         // update the status tip
         QString statusTip = QCoreApplication::translate(cmd->className(),
-            cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
+            cmd->getStatusTip());
         if (statusTip.isEmpty())
             statusTip = toolTip;
         action->setStatusTip(statusTip);
diff --git a/src/Gui/InputVector.h b/src/Gui/InputVector.h
index de5009ded4..614385fe83 100644
--- a/src/Gui/InputVector.h
+++ b/src/Gui/InputVector.h
@@ -127,11 +127,10 @@ public:
 
         if (this->direction->count() == 0) {
             this->direction->insertItems(0, QStringList()
-             << QApplication::translate("Gui::LocationDialog", "X", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "Y", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "Z", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "User defined...", 0, 
-                QApplication::UnicodeUTF8)
+             << QApplication::translate("Gui::LocationDialog", "X")
+             << QApplication::translate("Gui::LocationDialog", "Y")
+             << QApplication::translate("Gui::LocationDialog", "Z")
+             << QApplication::translate("Gui::LocationDialog", "User defined...")
             );
 
             this->direction->setCurrentIndex(2);
@@ -142,15 +141,11 @@ public:
             this->direction->setItemData(2, QVariant::fromValue<Base::Vector3d>(Base::Vector3d(0,0,1)));
         }
         else {
-            this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X", 0,
-                QApplication::UnicodeUTF8));
-            this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y", 0,
-                QApplication::UnicodeUTF8));
-            this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z", 0,
-                QApplication::UnicodeUTF8));
+            this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X"));
+            this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y"));
+            this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z"));
             this->direction->setItemText(this->direction->count()-1,
-                QApplication::translate("Gui::LocationDialog", "User defined...", 0,
-                QApplication::UnicodeUTF8));
+                QApplication::translate("Gui::LocationDialog", "User defined..."));
         }
     }
 
@@ -249,11 +244,10 @@ public:
 
         if (this->direction->count() == 0) {
             this->direction->insertItems(0, QStringList()
-             << QApplication::translate("Gui::LocationDialog", "X", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "Y", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "Z", 0, QApplication::UnicodeUTF8)
-             << QApplication::translate("Gui::LocationDialog", "User defined...", 0, 
-                QApplication::UnicodeUTF8)
+             << QApplication::translate("Gui::LocationDialog", "X")
+             << QApplication::translate("Gui::LocationDialog", "Y")
+             << QApplication::translate("Gui::LocationDialog", "Z")
+             << QApplication::translate("Gui::LocationDialog", "User defined...")
             );
 
             this->direction->setCurrentIndex(2);
@@ -264,15 +258,11 @@ public:
             this->direction->setItemData(2, QVariant::fromValue<Base::Vector3d>(Base::Vector3d(0,0,1)));
         }
         else {
-            this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X", 0,
-                QApplication::UnicodeUTF8));
-            this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y", 0,
-                QApplication::UnicodeUTF8));
-            this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z", 0,
-                QApplication::UnicodeUTF8));
+            this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X"));
+            this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y"));
+            this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z"));
             this->direction->setItemText(this->direction->count()-1,
-                QApplication::translate("Gui::LocationDialog", "User defined...", 0,
-                QApplication::UnicodeUTF8));
+                QApplication::translate("Gui::LocationDialog", "User defined..."));
         }
     }
 
diff --git a/src/Gui/MenuManager.cpp b/src/Gui/MenuManager.cpp
index 2163562115..9b229706d2 100644
--- a/src/Gui/MenuManager.cpp
+++ b/src/Gui/MenuManager.cpp
@@ -22,7 +22,7 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
+#ifndef _PreComp_
 # include <QApplication>
 # include <QMenu>
 # include <QMenuBar>
@@ -210,8 +210,7 @@ void MenuManager::setup(MenuItem* menuItems) const
                 // create a new menu
                 std::string menuName = (*it)->command();
                 QMenu* menu = menuBar->addMenu(
-                    QApplication::translate("Workbench", menuName.c_str(),
-                                            0, QApplication::UnicodeUTF8));
+                    QApplication::translate("Workbench", menuName.c_str()));
                 action = menu->menuAction();
                 menu->setObjectName(QString::fromLatin1(menuName.c_str()));
                 action->setObjectName(QString::fromLatin1(menuName.c_str()));
@@ -264,8 +263,7 @@ void MenuManager::setup(MenuItem* item, QMenu* menu) const
                     // Creste a submenu
                     std::string menuName = (*it)->command();
                     QMenu* submenu = menu->addMenu(
-                        QApplication::translate("Workbench", menuName.c_str(),
-                                                0, QApplication::UnicodeUTF8));
+                        QApplication::translate("Workbench", menuName.c_str()));
                     QAction* action = submenu->menuAction();
                     submenu->setObjectName(QString::fromLatin1((*it)->command().c_str()));
                     action->setObjectName(QString::fromLatin1((*it)->command().c_str()));
@@ -334,14 +332,12 @@ void MenuManager::retranslate(QMenu* menu) const
     if (cmd) {
         menu->setTitle(
             QApplication::translate(cmd->className(),
-                                    cmd->getMenuText(),
-                                    0, QCoreApplication::CodecForTr));
+                                    cmd->getMenuText()));
     }
     else {
         menu->setTitle(
             QApplication::translate("Workbench",
-                                    (const char*)menuName,
-                                    0, QApplication::UnicodeUTF8));
+                                    (const char*)menuName));
     }
     QList<QAction*> actions = menu->actions();
     for (QList<QAction*>::Iterator it = actions.begin(); it != actions.end(); ++it) {
diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp
index 2063001777..361437f6ac 100644
--- a/src/Gui/NetworkRetriever.cpp
+++ b/src/Gui/NetworkRetriever.cpp
@@ -419,17 +419,13 @@ Action * StdCmdDownloadOnlineHelp::createAction(void)
     QString exe = QString::fromLatin1(App::GetApplication().getExecutableName());
     pcAction = new Action(this,getMainWindow());
     pcAction->setText(QCoreApplication::translate(
-        this->className(), sMenuText, 0,
-        QCoreApplication::CodecForTr));
+        this->className(), sMenuText));
     pcAction->setToolTip(QCoreApplication::translate(
-        this->className(), sToolTipText, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sToolTipText).arg(exe));
     pcAction->setStatusTip(QCoreApplication::translate(
-        this->className(), sStatusTip, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sStatusTip).arg(exe));
     pcAction->setWhatsThis(QCoreApplication::translate(
-        this->className(), sWhatsThis, 0,
-        QCoreApplication::CodecForTr).arg(exe));
+        this->className(), sWhatsThis).arg(exe));
     pcAction->setIcon(Gui::BitmapFactory().pixmap(sPixmap));
     pcAction->setShortcut(QString::fromLatin1(sAccel));
 
@@ -441,17 +437,13 @@ void StdCmdDownloadOnlineHelp::languageChange()
     if (_pcAction) {
         QString exe = QString::fromLatin1(App::GetApplication().getExecutableName());
         _pcAction->setText(QCoreApplication::translate(
-            this->className(), sMenuText, 0,
-            QCoreApplication::CodecForTr));
+            this->className(), sMenuText));
         _pcAction->setToolTip(QCoreApplication::translate(
-            this->className(), sToolTipText, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sToolTipText).arg(exe));
         _pcAction->setStatusTip(QCoreApplication::translate(
-            this->className(), sStatusTip, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sStatusTip).arg(exe));
         _pcAction->setWhatsThis(QCoreApplication::translate(
-            this->className(), sWhatsThis, 0,
-            QCoreApplication::CodecForTr).arg(exe));
+            this->className(), sWhatsThis).arg(exe));
     }
 }
 
@@ -556,8 +548,7 @@ void StdCmdDownloadOnlineHelp::wgetFinished()
 {
     if (_pcAction)
         _pcAction->setText(QCoreApplication::translate(
-            this->className(), sMenuText, 0,
-            QCoreApplication::CodecForTr));
+            this->className(), sMenuText));
 }
 
 #include "moc_NetworkRetriever.cpp"
diff --git a/src/Gui/ToolBarManager.cpp b/src/Gui/ToolBarManager.cpp
index 31aac6af46..554bd3b980 100644
--- a/src/Gui/ToolBarManager.cpp
+++ b/src/Gui/ToolBarManager.cpp
@@ -22,7 +22,7 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
+#ifndef _PreComp_
 # include <QApplication>
 # include <QAction>
 # include <QToolBar>
@@ -200,8 +200,7 @@ void ToolBarManager::setup(ToolBarItem* toolBarItems)
         if (!toolbar) {
             toolbar = getMainWindow()->addToolBar(
                 QApplication::translate("Workbench",
-                                        toolbarName.c_str(),
-                                        0, QApplication::UnicodeUTF8)); // i18n
+                                        toolbarName.c_str())); // i18n
             toolbar->setObjectName(name);
             toolbar->setVisible(visible);
             toolbar_added = true;
@@ -324,8 +323,7 @@ void ToolBarManager::retranslate() const
         QByteArray toolbarName = (*it)->objectName().toUtf8();
         (*it)->setWindowTitle(
             QApplication::translate("Workbench",
-                                    (const char*)toolbarName,
-                                    0, QApplication::UnicodeUTF8));
+                                    (const char*)toolbarName));
     }
 }
 
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index f6406b15b5..15e2666774 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -229,12 +229,12 @@ QString ActionSelector::availableLabel() const
 
 void ActionSelector::retranslateUi()
 {
-    labelAvailable->setText(QApplication::translate("Gui::ActionSelector", "Available:", 0, QApplication::UnicodeUTF8));
-    labelSelected->setText(QApplication::translate("Gui::ActionSelector", "Selected:", 0, QApplication::UnicodeUTF8));
-    addButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Add", 0, QApplication::UnicodeUTF8));
-    removeButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Remove", 0, QApplication::UnicodeUTF8));
-    upButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Move up", 0, QApplication::UnicodeUTF8));
-    downButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Move down", 0, QApplication::UnicodeUTF8));
+    labelAvailable->setText(QApplication::translate("Gui::ActionSelector", "Available:"));
+    labelSelected->setText(QApplication::translate("Gui::ActionSelector", "Selected:"));
+    addButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Add"));
+    removeButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Remove"));
+    upButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Move up"));
+    downButton->setToolTip(QApplication::translate("Gui::ActionSelector", "Move down"));
 }
 
 void ActionSelector::changeEvent(QEvent* event)
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index 106947677b..2107b80970 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -255,8 +255,7 @@ int PropertyItem::decimals() const
 QVariant PropertyItem::toolTip(const App::Property* prop) const
 {
     QString str = QApplication::translate("App::Property",
-                                          prop->getDocumentation(),
-                                          0, QApplication::UnicodeUTF8);
+                                          prop->getDocumentation());
     return QVariant(str);
 }
 
diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
index b263f5f03f..26fb372281 100644
--- a/src/Mod/Drawing/Gui/Command.cpp
+++ b/src/Mod/Drawing/Gui/Command.cpp
@@ -215,36 +215,32 @@ void CmdDrawingNewPage::languageChange()
         int id = (*it)->property("TemplateId").toInt();
         QString orientation = (*it)->property("TemplateOrientation").toString();
         if (orientation.compare(QLatin1String("landscape"), Qt::CaseInsensitive) == 0)
-            orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape", 0, QCoreApplication::CodecForTr);
+            orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape");
         else if (orientation.compare(QLatin1String("portrait"), Qt::CaseInsensitive) == 0)
-            orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait", 0, QCoreApplication::CodecForTr);
+            orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait");
         QString info = (*it)->property("TemplateInfo").toString();
 
         if (info.isEmpty()) {
             (*it)->setText(QCoreApplication::translate(
-                "Drawing_NewPage", "%1%2 %3", 0,
-                QCoreApplication::CodecForTr)
+                "Drawing_NewPage", "%1%2 %3")
                 .arg(paper)
                 .arg(id)
                 .arg(orientation));
             (*it)->setToolTip(QCoreApplication::translate(
-                "Drawing_NewPage", "Insert new %1%2 %3 drawing", 0,
-                QCoreApplication::CodecForTr)
+                "Drawing_NewPage", "Insert new %1%2 %3 drawing")
                 .arg(paper)
                 .arg(id)
                 .arg(orientation));
         }
         else {
             (*it)->setText(QCoreApplication::translate(
-                "Drawing_NewPage", "%1%2 %3 (%4)", 0,
-                QCoreApplication::CodecForTr)
+                "Drawing_NewPage", "%1%2 %3 (%4)")
                 .arg(paper)
                 .arg(id)
                 .arg(orientation)
                 .arg(info));
             (*it)->setToolTip(QCoreApplication::translate(
-                "Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing", 0,
-                QCoreApplication::CodecForTr)
+                "Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing")
                 .arg(paper)
                 .arg(id)
                 .arg(orientation)
diff --git a/src/Mod/Sandbox/Gui/TaskPanelView.cpp b/src/Mod/Sandbox/Gui/TaskPanelView.cpp
index 1ebe6952fd..92f709608d 100644
--- a/src/Mod/Sandbox/Gui/TaskPanelView.cpp
+++ b/src/Mod/Sandbox/Gui/TaskPanelView.cpp
@@ -172,18 +172,18 @@ public:
 
     void retranslateUi(QWidget *MainWindow2)
     {
-        MainWindow2->setWindowTitle(QApplication::translate("MainWindow2", "ActionBox Example", 0, QApplication::UnicodeUTF8));
-        actionNew->setText(QApplication::translate("MainWindow2", "Create new file", 0, QApplication::UnicodeUTF8));
-        actionLoad->setText(QApplication::translate("MainWindow2", "Load a file", 0, QApplication::UnicodeUTF8));
-        actionSave->setText(QApplication::translate("MainWindow2", "Save current file", 0, QApplication::UnicodeUTF8));
-        actionPrint->setText(QApplication::translate("MainWindow2", "Print file contents", 0, QApplication::UnicodeUTF8));
-        ActionGroup1->setProperty("headerText", QVariant(QApplication::translate("MainWindow2", "Choose Scheme", 0, QApplication::UnicodeUTF8)));
-        rbDefaultScheme->setText(QApplication::translate("MainWindow2", "Default", 0, QApplication::UnicodeUTF8));
-        rbXPBlueScheme->setText(QApplication::translate("MainWindow2", "XP Blue", 0, QApplication::UnicodeUTF8));
-        rbXPBlue2Scheme->setText(QApplication::translate("MainWindow2", "XP Blue 2", 0, QApplication::UnicodeUTF8));
-        rbVistaScheme->setText(QApplication::translate("MainWindow2", "Vista", 0, QApplication::UnicodeUTF8));
-        rbMacScheme->setText(QApplication::translate("MainWindow2", "MacOS", 0, QApplication::UnicodeUTF8));
-        rbAndroidScheme->setText(QApplication::translate("MainWindow2", "Android", 0, QApplication::UnicodeUTF8));
+        MainWindow2->setWindowTitle(QApplication::translate("MainWindow2", "ActionBox Example"));
+        actionNew->setText(QApplication::translate("MainWindow2", "Create new file"));
+        actionLoad->setText(QApplication::translate("MainWindow2", "Load a file"));
+        actionSave->setText(QApplication::translate("MainWindow2", "Save current file"));
+        actionPrint->setText(QApplication::translate("MainWindow2", "Print file contents"));
+        ActionGroup1->setProperty("headerText", QVariant(QApplication::translate("MainWindow2", "Choose Scheme")));
+        rbDefaultScheme->setText(QApplication::translate("MainWindow2", "Default"));
+        rbXPBlueScheme->setText(QApplication::translate("MainWindow2", "XP Blue"));
+        rbXPBlue2Scheme->setText(QApplication::translate("MainWindow2", "XP Blue 2"));
+        rbVistaScheme->setText(QApplication::translate("MainWindow2", "Vista"));
+        rbMacScheme->setText(QApplication::translate("MainWindow2", "MacOS"));
+        rbAndroidScheme->setText(QApplication::translate("MainWindow2", "Android"));
         Q_UNUSED(MainWindow2);
     } // retranslateUi
 
@@ -351,15 +351,15 @@ public:
 
     void retranslateUi(QWidget *MainWindow)
     {
-        MainWindow->setWindowTitle(QApplication::translate("TestTaskBox", "ActionBox Example", 0, QApplication::UnicodeUTF8));
-        label->setText(QApplication::translate("TestTaskBox", "ActionBoxes", 0, QApplication::UnicodeUTF8));
-        label_2->setText(QApplication::translate("TestTaskBox", "ActionLabels", 0, QApplication::UnicodeUTF8));
-        ActionLabel1->setText(QApplication::translate("TestTaskBox", "Simple clickable action", 0, QApplication::UnicodeUTF8));
-        ActionLabel2->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon", 0, QApplication::UnicodeUTF8));
+        MainWindow->setWindowTitle(QApplication::translate("TestTaskBox", "ActionBox Example"));
+        label->setText(QApplication::translate("TestTaskBox", "ActionBoxes"));
+        label_2->setText(QApplication::translate("TestTaskBox", "ActionLabels"));
+        ActionLabel1->setText(QApplication::translate("TestTaskBox", "Simple clickable action"));
+        ActionLabel2->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon"));
 #ifndef QT_NO_TOOLTIP
-        ActionLabel3->setToolTip(QApplication::translate("TestTaskBox", "Tooltip of the ActionLabel", 0, QApplication::UnicodeUTF8));
+        ActionLabel3->setToolTip(QApplication::translate("TestTaskBox", "Tooltip of the ActionLabel"));
 #endif // QT_NO_TOOLTIP
-        ActionLabel3->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon and tooltip", 0, QApplication::UnicodeUTF8));
+        ActionLabel3->setText(QApplication::translate("TestTaskBox", "Simple clickable action with icon and tooltip"));
         Q_UNUSED(MainWindow);
     } // retranslateUi
 };