From 19a12103763b52c87606fcf396638303fb3f7974 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 23 Sep 2010 15:18:07 +0200
Subject: [PATCH] L10n: tr()-fixes.
---
src/plugins/debugger/cdb/cdbengine.cpp | 4 +++-
src/plugins/debugger/gdb/gdboptionspage.ui | 2 +-
src/plugins/help/generalsettingspage.ui | 2 +-
src/plugins/qmljseditor/qmljseditorplugin.cpp | 3 ++-
.../qt4projectmanager/wizards/abstractmobileapp.cpp | 10 ++++++----
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 6e13f5302f9..66bc3067a71 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1023,6 +1023,7 @@ void CdbEngine::assignValueInDebugger(const WatchData *w, const QString &expr, c
const QString iname = QLatin1String(w->iname);
const QString type = QLatin1String(w->type);
const QString newValue = valueV.toString();
+ //: Arguments: New value, name, (type)
showMessage(tr("Assigning '%1' to '%2' (%3)...").arg(newValue, iname, type), LogMisc);
do {
// Value must be scalar
@@ -1030,7 +1031,7 @@ void CdbEngine::assignValueInDebugger(const WatchData *w, const QString &expr, c
if (type != QVariant::Double && type != QVariant::Bool
&& type != QVariant::Int && type != QVariant::LongLong
&& type != QVariant::UInt&& type != QVariant::ULongLong) {
- errorMessage = tr("Cannot assign only scalar values.");
+ errorMessage = tr("Can assign only scalar values.");
break;
}
// Check the assigneable type
@@ -1066,6 +1067,7 @@ void CdbEngine::assignValueInDebugger(const WatchData *w, const QString &expr, c
} while (false);
QApplication::restoreOverrideCursor();
if (!success) {
+ //: Arguments: New value, name, (type): Error
const QString msg = tr("Unable to assign the value '%1' to '%2' (%3): %4").
arg(newValue, expr, type, errorMessage);
warning(msg);
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index 658b139c999..5baef8d7677 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -132,7 +132,7 @@ name in different directories.</string>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxAdjustBreakpointLocations">
<property name="text">
- <string>Adjust Breakpoint Locationss</string>
+ <string>Adjust Breakpoint Locations</string>
</property>
</widget>
</item>
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index e317495c0d2..0bcd55ef5e7 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -368,7 +368,7 @@
<string>Switch to editor context after last help page is closed.</string>
</property>
<property name="text">
- <string>Return to editor on close last page</string>
+ <string>Return to editor on closing the last page</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index c10784d5fe4..160d047cca1 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -151,7 +151,8 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
Core::ActionContainer *contextMenu = am->createMenu(QmlJSEditor::Constants::M_CONTEXT);
Core::ActionContainer *qmlToolsMenu = am->createMenu(Core::Id(Constants::M_TOOLS_QML));
QMenu *menu = qmlToolsMenu->menu();
- menu->setTitle(tr("QML")); //: QML sub-menu in the Tools menu
+ //: QML sub-menu in the Tools menu
+ menu->setTitle(tr("QML"));
menu->setEnabled(true);
am->actionContainer(Core::Constants::M_TOOLS)->addMenu(qmlToolsMenu);
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index c6192515469..7f3a873754f 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -182,7 +182,7 @@ QByteArray AbstractMobileApp::generateDesktopFile(QString *errorMessage) const
{
QFile desktopTemplate(path(DesktopOrigin));
if (!desktopTemplate.open(QIODevice::ReadOnly)) {
- *errorMessage = QCoreApplication::translate("AbstractMobileApp",
+ *errorMessage = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
"Could not open desktop file template");
return QByteArray();
}
@@ -194,7 +194,8 @@ QByteArray AbstractMobileApp::generateMainCpp(QString *errorMessage) const
{
QFile sourceFile(path(MainCppOrigin));
if (!sourceFile.open(QIODevice::ReadOnly)) {
- *errorMessage = tr("Could not open main.cpp template '%1'.")
+ *errorMessage = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
+ "Could not open main.cpp template '%1'.")
.arg(sourceFile.fileName());
return QByteArray();
}
@@ -240,7 +241,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
const QChar comment = QLatin1Char('#');
QFile proFile(path(AppProOrigin));
if (!proFile.open(QIODevice::ReadOnly)) {
- *errorMessage = tr("Could not open project file template '%1'.")
+ *errorMessage = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
+ "Could not open project file template '%1'.")
.arg(proFile.fileName());
return QByteArray();
}
@@ -332,7 +334,7 @@ QByteArray AbstractMobileApp::readBlob(const QString &filePath,
{
QFile sourceFile(filePath);
if (!sourceFile.open(QIODevice::ReadOnly)) {
- *errorMsg = QCoreApplication::translate("AbstractMobileApp",
+ *errorMsg = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
"Could not open template file '%1'.").arg(filePath);
return QByteArray();
}
--
GitLab