From 148e389587c125aa6a2d8de74496c1fbb5b4e0bd Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jkobus@trolltech.com>
Date: Thu, 31 Mar 2011 16:30:37 +0200
Subject: [PATCH] Fix typos in source strings
Reviewed-by: Pawel Polanski
---
src/plugins/debugger/lldb/ipcenginehost.cpp | 2 +-
src/plugins/git/gitclient.cpp | 2 +-
src/plugins/memcheck/memchecktool.cpp | 2 +-
.../qt-maemo/maemopublisherfremantlefree.cpp | 2 +-
.../qt4projectmanager/qt-maemo/maemosettingspages.cpp | 10 +++++-----
.../qt4projectmanager/qt-s60/s60runcontrolbase.cpp | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp
index aaf555a9cc9..905c2b80978 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.cpp
+++ b/src/plugins/debugger/lldb/ipcenginehost.cpp
@@ -645,7 +645,7 @@ void IPCEngineHost::readyRead()
char terminator;
m_device->getChar(&terminator);
if (terminator != 'T') {
- showStatusMessage(tr("Fatal engine shutdown. Incompatible binary or ipc error."));
+ showStatusMessage(tr("Fatal engine shutdown. Incompatible binary or IPC error."));
showMessage(QLatin1String("IPC Error: terminator missing"));
nuke();
return;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 3ab49446615..8285e6f7167 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -108,7 +108,7 @@ public:
layout->setContentsMargins(3, 0, 3, 0);
layout->setSpacing(2);
- m_patience->setToolTip(tr("Use the patience algorithmn for calculating the diff"));
+ m_patience->setToolTip(tr("Use the patience algorithm for calculating the diff"));
m_patience->setText(tr("Patience"));
layout->addWidget(m_patience);
m_patience->setCheckable(true);
diff --git a/src/plugins/memcheck/memchecktool.cpp b/src/plugins/memcheck/memchecktool.cpp
index 9d1e9df5d84..e6d0f4ddd74 100644
--- a/src/plugins/memcheck/memchecktool.cpp
+++ b/src/plugins/memcheck/memchecktool.cpp
@@ -238,7 +238,7 @@ MemcheckTool::MemcheckTool(QObject *parent) :
m_filterProjectAction->setCheckable(true);
m_suppressionSeparator->setSeparator(true);
- m_suppressionSeparator->setToolTip(tr("These suppression files where used in the last memory analyzer run."));
+ m_suppressionSeparator->setToolTip(tr("These suppression files were used in the last memory analyzer run."));
}
void MemcheckTool::settingsDestroyed(QObject *settings)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
index fb4ea348f5c..3c80b1d711d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
@@ -585,7 +585,7 @@ QStringList MaemoPublisherFremantleFree::findProblems() const
= qobject_cast<Qt4Maemo5Target *>(m_buildConfig->target());
const QString &description = target->shortDescription();
if (description.trimmed().isEmpty()) {
- problems << tr("The package description is empty. You must set one "
+ problems << tr("The package description is empty. You must set one "
"in Projects -> Run -> Create Package -> Details.");
} else if (description.contains(QLatin1String("insert up to"))) {
problems << tr("The package description is '%1', which is probably "
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp
index 32070694f75..0a5c97766f5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingspages.cpp
@@ -181,20 +181,20 @@ public:
: m_settingsPage(settingsPage)
{
setWindowTitle(tr("Qemu error"));
- QString message = tr("Qemu crashed.");
+ QString message = tr("Qemu crashed.") + QLatin1String(" <p>");
const MaemoQemuSettings::OpenGlMode openGlMode
= MaemoQemuSettings::openGlMode();
- const QString linkString = QLatin1String("<p><a href=\"dummy\">")
+ const QString linkString = QLatin1String("</p><a href=\"dummy\">")
+ tr("Click here to change the OpenGL mode.")
+ QLatin1String("</a>");
if (openGlMode == MaemoQemuSettings::HardwareAcceleration) {
- message += tr("<p>You have configured Qemu to use OpenGL "
+ message += tr("You have configured Qemu to use OpenGL "
"hardware acceleration, which might not be supported by "
"your system. You could try using software rendering instead.");
message += linkString;
} else if (openGlMode == MaemoQemuSettings::AutoDetect) {
- message += tr("<p>Qemu is currently configured to auto-detect the "
- "OpenGL mode, which is known to not work in some cases."
+ message += tr("Qemu is currently configured to auto-detect the "
+ "OpenGL mode, which is known to not work in some cases. "
"You might want to use software rendering instead.");
message += linkString;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
index 36b586af7b1..09f7cc50df8 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
@@ -149,7 +149,7 @@ bool S60RunControlBase::promptToStop(bool *optionalPrompt) const
// We override the settings prompt
QTC_ASSERT(isRunning(), return true;)
- const QString question = tr("<html><head/><body><center><i>%1</i> is still running on the device.<center/>"
+ const QString question = tr("<html><head/><body><center><i>%1</i> is still running on the device.</center>"
"<center>Terminating it can leave the target in an inconsistent state.</center>"
"<center>Would you still like to terminate it?</center></body></html>").arg(displayName());
return showPromptToStopDialog(tr("Application Still Running"), question,
--
GitLab