From ad21b4859ae1cb81b9350e891be610a40130d3c5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 1 Mar 2011 17:07:15 +0100
Subject: [PATCH] L10n: tr()-Fixes.
---
src/plugins/cpaster/pastebindotcomsettings.ui | 2 +-
src/plugins/debugger/commonoptionspage.cpp | 5 +++--
src/plugins/debugger/debuggerrunner.cpp | 2 +-
src/plugins/debugger/qml/qmlcppengine.cpp | 2 +-
src/plugins/qt4projectmanager/debugginghelper.ui | 2 +-
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 4 ++--
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui
index 10b3732eda6..2b07a2f16aa 100644
--- a/src/plugins/cpaster/pastebindotcomsettings.ui
+++ b/src/plugins/cpaster/pastebindotcomsettings.ui
@@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string>
+ <string><a href="http://pastebin.com">pastebin.com</a> allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string>
</property>
</widget>
</item>
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 520fcd933a8..b0b3ac28568 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -181,7 +181,7 @@ QString DebuggingHelperOptionPage::id() const
QString DebuggingHelperOptionPage::displayName() const
{
- return tr("Debugging Helper");
+ return QCoreApplication::translate("Debugger", "Debugging Helper");
}
QString DebuggingHelperOptionPage::category() const
@@ -215,7 +215,8 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
m_ui.setupUi(w);
m_ui.dumperLocationChooser->setExpectedKind(Utils::PathChooser::Command);
- m_ui.dumperLocationChooser->setPromptDialogTitle(tr("Choose DebuggingHelper Location"));
+ m_ui.dumperLocationChooser->setPromptDialogTitle(QCoreApplication::translate("Debugger",
+ "Choose DebuggingHelper Location"));
m_ui.dumperLocationChooser->setInitialBrowsePathBackup(
ICore::instance()->resourcePath() + "../../lib");
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 62683ceef59..8e89d741ae0 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -522,7 +522,7 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa
requiredTypes = engineTypes(sp);
}
if (requiredTypes.isEmpty()) {
- result.errorMessage = DebuggerPlugin::tr("Internal error: Unable to determine debugger engine type for this configuration");
+ result.errorMessage = QLatin1String("Internal error: Unable to determine debugger engine type for this configuration");
return result;
}
if (debug)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 1fd703ec320..c9b19a21ad8 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -141,7 +141,7 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp,
setObjectName(QLatin1String("QmlCppEngine"));
d->m_cppEngine = DebuggerRunControlFactory::createEngine(slaveEngineType, sp, this, errorMessage);
if (!d->m_cppEngine) {
- *errorMessage = tr("The slave debugging engine requires for combined QML/C++-Debugging could not be created:").arg(*errorMessage);
+ *errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
return;
}
d->m_activeEngine = d->m_cppEngine;
diff --git a/src/plugins/qt4projectmanager/debugginghelper.ui b/src/plugins/qt4projectmanager/debugginghelper.ui
index 799ae09f324..5239efba832 100644
--- a/src/plugins/qt4projectmanager/debugginghelper.ui
+++ b/src/plugins/qt4projectmanager/debugginghelper.ui
@@ -129,7 +129,7 @@
<item row="2" column="1">
<widget class="QLabel" name="qmlDebuggingLibStatus">
<property name="text">
- <string>TextLabel</string>
+ <string notr="true">TextLabel</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 016e76429c4..8b533156491 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -529,7 +529,7 @@ ProjectExplorer::RunControl* S60DeviceDebugRunControlFactory::create(ProjectExpl
const Debugger::DebuggerStartParameters startParameters = s60DebuggerStartParams(rc);
const Debugger::ConfigurationCheck check = Debugger::checkDebugConfiguration(startParameters);
if (!check) {
- Core::ICore::instance()->showWarningWithOptions(tr("Debugger for Symbian Platform"),
+ Core::ICore::instance()->showWarningWithOptions(S60DeviceDebugRunControl::tr("Debugger for Symbian Platform"),
check.errorMessage, check.errorDetailsString(), check.settingsCategory, check.settingsPage);
return 0;
}
@@ -538,7 +538,7 @@ ProjectExplorer::RunControl* S60DeviceDebugRunControlFactory::create(ProjectExpl
QString S60DeviceDebugRunControlFactory::displayName() const
{
- return tr("Debug on Device");
+ return S60DeviceDebugRunControl::tr("Debug on Device");
}
ProjectExplorer::RunConfigWidget *S60DeviceDebugRunControlFactory::createConfigurationWidget(RunConfiguration* /*runConfiguration */)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 6f1b9117c0f..61c23a73be7 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -180,7 +180,7 @@ QtVersionManager::QtVersionManager()
ProjectExplorer::MingwToolChain *tc = createToolChain<ProjectExplorer::MingwToolChain>(ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID);
if (tc) {
tc->setCompilerPath(QDir::fromNativeSeparators(mingwDir) + QLatin1String("/bin/gcc.exe"));
- tc->setDisplayName(tr("Mingw from %1").arg(version->displayName()));
+ tc->setDisplayName(tr("MinGW from %1").arg(version->displayName()));
ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc);
}
}
--
GitLab