From 31eaf32ab4be399118f9185bf80b32c3aebfa05e Mon Sep 17 00:00:00 2001
From: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Date: Thu, 23 Apr 2015 23:57:48 +0300
Subject: Fix untranslated messages

Change-Id: I21ff7f3f70116944ba08ea18bdeeb258c0984f09
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/beautifier/beautifierplugin.cpp |  2 +-
 src/plugins/coreplugin/mainwindow.cpp       |  3 ++-
 src/plugins/coreplugin/navigationwidget.cpp |  5 +++--
 src/plugins/help/helpwidget.cpp             | 10 +++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index 67bafd1a13..c533aa59bd 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -93,7 +93,7 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt
     m_tools << new Uncrustify::Uncrustify(this);
 
     Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
-    menu->menu()->setTitle(QLatin1String("Beautifier"));
+    menu->menu()->setTitle(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
     Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
 
     for (int i = 0, total = m_tools.count(); i < total; ++i) {
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 4d8ed853ec..2bfa13b42e 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -670,7 +670,8 @@ void MainWindow::registerDefaultActions()
 
     // Show Sidebar Action
     m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Constants::ICON_TOGGLE_SIDEBAR)),
-                                        tr(Constants::TR_SHOW_SIDEBAR), this);
+                                        QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR),
+                                        this);
     m_toggleSideBarAction->setCheckable(true);
     cmd = ActionManager::registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR);
     cmd->setAttribute(Command::CA_UpdateText);
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 790657dbd8..d262591c56 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -40,6 +40,7 @@
 #include "id.h"
 #include "imode.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 #include <QSettings>
 
@@ -222,9 +223,9 @@ void NavigationWidget::updateToggleText()
     d->m_toggleSideBarAction->setEnabled(haveData && NavigationWidgetPlaceHolder::m_current);
 
     if (isShown())
-        d->m_toggleSideBarAction->setToolTip(tr(Constants::TR_HIDE_SIDEBAR));
+        d->m_toggleSideBarAction->setToolTip(QCoreApplication::translate("Core", Constants::TR_HIDE_SIDEBAR));
     else
-        d->m_toggleSideBarAction->setToolTip(tr(Constants::TR_SHOW_SIDEBAR));
+        d->m_toggleSideBarAction->setToolTip(QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR));
 }
 
 void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder)
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 69d07e4b21..67146cf53c 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -54,6 +54,7 @@
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
 
+#include <QCoreApplication>
 #include <QHBoxLayout>
 #include <QHelpEngine>
 #include <QHelpSearchEngine>
@@ -132,15 +133,18 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     }
     if (style != SideBarWidget) {
         m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
-                                            tr(Core::Constants::TR_SHOW_SIDEBAR), toolBar);
+                                            QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR),
+                                            toolBar);
         m_toggleSideBarAction->setCheckable(true);
         m_toggleSideBarAction->setChecked(false);
         cmd = Core::ActionManager::registerAction(m_toggleSideBarAction,
                                                   Core::Constants::TOGGLE_SIDEBAR, context);
         connect(m_toggleSideBarAction, &QAction::toggled, m_toggleSideBarAction,
                 [this](bool checked) {
-                    m_toggleSideBarAction->setText(checked ? tr(Core::Constants::TR_HIDE_SIDEBAR)
-                                                           : tr(Core::Constants::TR_SHOW_SIDEBAR));
+                    m_toggleSideBarAction->setText(
+                        QCoreApplication::translate("Core",
+                                                    checked ? Core::Constants::TR_HIDE_SIDEBAR
+                                                            : Core::Constants::TR_SHOW_SIDEBAR));
                 });
         addSideBar();
         m_toggleSideBarAction->setChecked(m_sideBar->isVisibleTo(this));
-- 
cgit v1.2.3