diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-28 17:29:33 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-29 13:58:36 +0100 |
commit | 8bb0134c50aaeda3484e93a6162d566fd83715d3 (patch) | |
tree | 32823d987cd15d258cf7ba0ea16e1fd23f3d4c6c /src/plugins | |
parent | 757fd039e6c936d75d8970013906fe6f166c3020 (diff) | |
download | qt-creator-8bb0134c50aaeda3484e93a6162d566fd83715d3.tar.gz |
tr()-Fixes: Fix translation contexts.
Change-Id: Ic043a097947a80e2fb5cb381c585375c4e5f5eef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 11 | ||||
-rw-r--r-- | src/plugins/cpptools/builtinindexingsupport.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmlconsolemanager.cpp | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index b4798ed35b..8421c913cf 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -70,6 +70,7 @@ namespace CMakeProjectManager { namespace Internal { class GeneratorInfo { + Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::GeneratorInfo) public: enum Ninja { NoNinja, OfferNinja, ForceNinja }; static QList<GeneratorInfo> generatorInfosFor(ProjectExplorer::Kit *k, Ninja n, bool hasCodeBlocks); @@ -148,7 +149,7 @@ QString GeneratorInfo::displayName() const if (!m_kit) return QString(); if (m_isNinja) - return QApplication::tr("Ninja (%1)").arg(m_kit->displayName()); + return tr("Ninja (%1)").arg(m_kit->displayName()); ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit); ProjectExplorer::Abi targetAbi = tc->targetAbi(); if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { @@ -156,16 +157,16 @@ QString GeneratorInfo::displayName() const || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) { - return QApplication::tr("NMake Generator (%1)").arg(m_kit->displayName()); + return tr("NMake Generator (%1)").arg(m_kit->displayName()); } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { if (Utils::HostOsInfo::isWindowsHost()) - return QApplication::tr("MinGW Generator (%1)").arg(m_kit->displayName()); + return tr("MinGW Generator (%1)").arg(m_kit->displayName()); else - return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName()); + return tr("Unix Generator (%1)").arg(m_kit->displayName()); } } else { // Non windows - return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName()); + return tr("Unix Generator (%1)").arg(m_kit->displayName()); } return QString(); } diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index e94ffb9ee3..e5c4ad83da 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -200,7 +200,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour if (sourceFiles.count() > 1) { Core::ICore::progressManager()->addTask(result, - QCoreApplication::translate("IndexingSupport", "Parsing"), + QCoreApplication::translate("CppTools::Internal::BuiltinIndexingSupport", "Parsing"), QLatin1String(CppTools::Constants::TASK_INDEX)); } diff --git a/src/plugins/qmljstools/qmlconsolemanager.cpp b/src/plugins/qmljstools/qmlconsolemanager.cpp index 34358714f7..9bde33c045 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.cpp +++ b/src/plugins/qmljstools/qmlconsolemanager.cpp @@ -36,6 +36,7 @@ #include <qmljs/iscriptevaluator.h> #include <QVariant> +#include <QCoreApplication> using namespace QmlJS; @@ -174,7 +175,8 @@ void QmlConsoleModel::evaluate(const QString &expression) } else { ConsoleItem *root = manager->rootItem(); ConsoleItem *item = constructLogItemTree( - root, QObject::tr("Can only evaluate during a QML debug session.")); + root, QCoreApplication::translate("QmlJSTools::Internal::QmlConsoleModel", + "Can only evaluate during a QML debug session.")); if (item) { QmlConsoleModel::qmlConsoleItemModel()->appendEditableRow(); manager->printToConsolePane(item); |