diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp index aaf555a9cc9761a3bf7d680cd6d43e7be312c27c..905c2b809781ceae51204d8e1d1dcf4b06a89186 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 3ab494466157dac0b0f8c8776470524e2c1408be..8285e6f716756bb922aa3607eddd94c184168d34 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 9d1e9df5d84c00b7dfe9903898c541bf87f9939a..e6d0f4ddd74ec4d27ddb544c73df233876baf49a 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 fb4ea348f5ce384b24e1deaad6145d7b130a9279..3c80b1d711dee3a8d49356ac63206b12e288ed83 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(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 32070694f75f339d94b68829669d8a0738cbcd6f..0a5c97766f54347da0aa4f7c55de56df702759ae 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("

"); const MaemoQemuSettings::OpenGlMode openGlMode = MaemoQemuSettings::openGlMode(); - const QString linkString = QLatin1String("

") + const QString linkString = QLatin1String("

") + tr("Click here to change the OpenGL mode.") + QLatin1String(""); if (openGlMode == MaemoQemuSettings::HardwareAcceleration) { - message += tr("

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("

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 36b586af7b1701142500630ec8852e31dd64affe..09f7cc50df815cf15df80ae56641e392b8da06a5 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("

%1 is still running on the device.
" + const QString question = tr("
%1 is still running on the device.
" "
Terminating it can leave the target in an inconsistent state.
" "
Would you still like to terminate it?
").arg(displayName()); return showPromptToStopDialog(tr("Application Still Running"), question,