From 520c936a45e17af6a13d7529266a304c6ddd0b8e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 5 Oct 2010 09:44:33 +0200
Subject: [PATCH] L10n: tr()-Fixes
---
src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui | 2 +-
src/plugins/cppeditor/cppinsertdecldef.cpp | 8 ++++----
src/plugins/debugger/qml/qmlengine.cpp | 2 +-
src/plugins/projectexplorer/debugginghelper.cpp | 3 ++-
src/plugins/qt4projectmanager/qmldumptool.cpp | 2 +-
src/plugins/qt4projectmanager/qmlobservertool.cpp | 3 ++-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 4 ++--
.../wizards/qmlstandaloneappwizardsourcespage.ui | 2 +-
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index 595b7d442e6..fc849a02b28 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
@@ -238,7 +238,7 @@
<item row="0" column="0">
<widget class="QRadioButton" name="verticalStretchRadioButton">
<property name="toolTip">
- <string>Strech horizontally. Scales the image to fit to the available area.</string>
+ <string>Stretch horizontally. Scales the image to fit to the available area.</string>
</property>
<property name="text">
<string/>
diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp
index 66bbdfd6919..9414a421487 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -74,8 +74,8 @@ public:
default: break;
}
- setDescription(QCoreApplication::tr("Add %1 declaration",
- "CppEditor::DeclFromDef").arg(type));
+ setDescription(QCoreApplication::translate("CppEditor::InsertDeclOperation",
+ "Add %1 declaration").arg(type));
}
void performChanges(CppRefactoringFile *, CppRefactoringChanges *refactoring)
@@ -217,8 +217,8 @@ public:
, m_decl(decl)
, m_loc(loc)
{
- setDescription(QCoreApplication::tr("Add definition in %1",
- "CppEditor::DefFromDecl")
+ setDescription(QCoreApplication::translate("CppEditor::InsertDefOperation",
+ "Add definition in %1")
.arg(m_loc.fileName()));
}
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 5e546d11958..366aa33f3be 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -221,7 +221,7 @@ void QmlEngine::connectionError(QAbstractSocket::SocketError socketError)
void QmlEngine::serviceConnectionError(const QString &serviceName)
{
- plugin()->showMessage(tr("QML Debugger: Couldn't connect to service '%1'.").arg(serviceName), StatusBar);
+ plugin()->showMessage(tr("QML Debugger: Could not connect to service '%1'.").arg(serviceName), StatusBar);
}
void QmlEngine::runEngine()
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index b006691cae0..1fb2b9a488d 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -120,6 +120,7 @@ QString DebuggingHelperLibrary::build(const QString &directory, const QString &m
const QString &qmakeCommand, const QString &mkspec,
const Utils::Environment &env, const QString &targetMode)
{
- return buildHelper(QCoreApplication::tr("GDB helper"), QLatin1String("gdbmacros.pro"), directory,
+ return buildHelper(QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
+ "GDB helper"), QLatin1String("gdbmacros.pro"), directory,
makeCommand, qmakeCommand, mkspec, env, targetMode);
}
diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp
index cc675ce6b0f..6aa691af8b8 100644
--- a/src/plugins/qt4projectmanager/qmldumptool.cpp
+++ b/src/plugins/qt4projectmanager/qmldumptool.cpp
@@ -208,7 +208,7 @@ QString QmlDumpTool::build(const QString &directory, const QString &makeCommand,
const QString &qmakeCommand, const QString &mkspec,
const Utils::Environment &env, const QString &targetMode)
{
- return buildHelper(QCoreApplication::tr("qmldump"), QLatin1String("qmldump.pro"),
+ return buildHelper(QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "qmldump"), QLatin1String("qmldump.pro"),
directory, makeCommand, qmakeCommand, mkspec, env, targetMode);
}
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp
index f2b55cbac65..a9829aff31a 100644
--- a/src/plugins/qt4projectmanager/qmlobservertool.cpp
+++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp
@@ -103,7 +103,8 @@ QString QmlObserverTool::build(const QString &directory, const QString &makeComm
const QString &qmakeCommand, const QString &mkspec,
const Utils::Environment &env, const QString &targetMode)
{
- return buildHelper(QCoreApplication::tr("QMLObserver"), QLatin1String("qmlobserver.pro"),
+ return buildHelper(QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "QMLObserver"),
+ QLatin1String("qmlobserver.pro"),
directory, makeCommand, qmakeCommand, mkspec, env, targetMode);
}
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 2e9fb6ce027..ef2b132e1ec 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1780,7 +1780,7 @@ QString QtVersion::buildDebuggingHelperLibrary(QFutureInterface<void> &future, b
(tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String("")));
}
} else {
- output += QCoreApplication::tr("Cannot build QMLObserver; Qt version must be 4.7.1 or higher.");
+ output += QCoreApplication::translate("Qt4ProjectManager::QtVersion", "Cannot build QMLObserver; Qt version must be 4.7.1 or higher.");
}
future.setProgressValue(3);
}
@@ -1793,7 +1793,7 @@ QString QtVersion::buildDebuggingHelperLibrary(QFutureInterface<void> &future, b
(tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String("")));
}
} else {
- output += QCoreApplication::tr("Cannot build qmldump; Qt version must be 4.7.1 or higher.");
+ output += QCoreApplication::translate("Qt4ProjectManager::QtVersion", "Cannot build qmldump; Qt version must be 4.7.1 or higher.");
}
future.setProgressValue(4);
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
index ffe258e3863..447014cebfe 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
@@ -65,7 +65,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Note: All files and directories which reside in the same directory as the Main QML File will be deployed. You can anytime modify the contents of that directory before deploying.</string>
+ <string>Note: All files and directories which reside in the same directory as the Main QML File will be deployed. You can modify the contents of that directory anytime before deploying.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
--
GitLab