diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index b774124f742..af92550ccd8 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -108,6 +108,7 @@ StashDialog::StashDialog(QWidget *parent) : m_deleteSelectionButton(new QPushButton(tr("Delete..."))), m_showCurrentButton(new QPushButton(tr("Show"))), m_restoreCurrentButton(new QPushButton(tr("Restore..."))), + //: Restore a git stash to new branch to be created m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to branch..."))), m_refreshButton(new QPushButton(tr("Refresh"))) { diff --git a/src/plugins/mercurial/optionspage.ui b/src/plugins/mercurial/optionspage.ui index 98d7266a674..2afd9fe65a7 100644 --- a/src/plugins/mercurial/optionspage.ui +++ b/src/plugins/mercurial/optionspage.ui @@ -85,7 +85,7 @@ - Show log entries: + Log count: diff --git a/src/plugins/mercurial/srcdestdialog.ui b/src/plugins/mercurial/srcdestdialog.ui index b72790bf373..6c5366aeb47 100644 --- a/src/plugins/mercurial/srcdestdialog.ui +++ b/src/plugins/mercurial/srcdestdialog.ui @@ -19,7 +19,7 @@ - Default Location: + Default Location true diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index 1039e954797..9a80170faf4 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -178,6 +178,7 @@ void PerforceChecker::parseOutput(const QString &response) } const QString repositoryRoot = clientRootFromOutput(response); if (repositoryRoot.isEmpty()) { + //: Unable to determine root of the p4 client installation emitFailed(tr("Unable to determine the client root.")); return; } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp index 26a3660ed85..b1316c143a5 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp @@ -139,7 +139,7 @@ void AbstractMaemoRunControl::deployProcessFinished() if (success) { emit addToOutputWindow(this, tr("Deployment finished.")); } else { - emit error(this, tr("Deployment failed: ") % sshDeployer->error()); + emit error(this, tr("Deployment failed: %1").arg(sshDeployer->error())); m_progress.reportCanceled(); } m_progress.reportFinished(); @@ -244,8 +244,7 @@ void MaemoRunControl::executionFinished() if (stoppedByUser) { emit addToOutputWindow(this, tr("Remote process stopped by user.")); } else if (sshRunner->hasError()) { - emit addToOutputWindow(this, tr("Remote process exited with error: ") - % sshRunner->error()); + emit addToOutputWindow(this, tr("Remote process exited with error: %1").arg(sshRunner->error())); } else { emit addToOutputWindow(this, tr("Remote process finished successfully.")); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp index 027c28437dc..29e98808f18 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp @@ -348,8 +348,7 @@ void MaemoSettingsWidget::handleTestThreadFinished() QString output; if (m_deviceTester->hasError()) { - output = tr("Device configuration test failed:\n"); - output.append(m_deviceTester->error()); + output = tr("Device configuration test failed:\n%1").arg(m_deviceTester->error()); if (currentConfig().type == MaemoDeviceConfig::Simulator) output.append(tr("\nDid you start Qemu?")); } else { @@ -382,8 +381,7 @@ QString MaemoSettingsWidget::parseTestOutput() const QRegExp unamePattern(QLatin1String("Linux (\\S+)\\s(\\S+)")); int index = unamePattern.indexIn(m_deviceTestOutput); if (index == -1) { - output = tr("Device configuration test failed: Unexpected output:\n"); - output.append(m_deviceTestOutput); + output = tr("Device configuration test failed: Unexpected output:\n%1").arg(m_deviceTestOutput); return output; } @@ -438,8 +436,7 @@ void MaemoSettingsWidget::handleDeployThreadFinished() QString output; if (m_keyDeployer->hasError()) { - output = tr("Key deployment failed: "); - output.append(m_keyDeployer->error()); + output = tr("Key deployment failed: %1").arg(m_keyDeployer->error()); } else { output = tr("Key was successfully deployed."); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui index c1bc5ea616f..f1a02e651de 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui @@ -178,7 +178,7 @@ - Gdbserver Port: + Gdb-server port: diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp index b43af146e29..85e3718309b 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp @@ -66,8 +66,7 @@ void MaemoSshThread::run() m_error = e.error(); } catch (const std::exception &e) { // Should in theory not be necessary, but Net7 leaks Botan exceptions. - m_error = tr("Error in cryptography backend: ") - + QLatin1String(e.what()); + m_error = tr("Error in cryptography backend: %1").arg(QLatin1String(e.what())); } } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 40758e81fcc..b3639a4b72d 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1392,11 +1392,12 @@ QString QtVersion::invalidReason() const if (qmakeCommand().isEmpty()) return QCoreApplication::translate("QtVersion", "No qmake path set"); if (displayName().isEmpty()) - return QCoreApplication::translate("QtVersion", "Qt Version has no name"); + return QCoreApplication::translate("QtVersion", "Qt version has no name"); if (m_notInstalled) - return QCoreApplication::translate("QtVersion", "Qt Version is not installed, please run make install"); + return QCoreApplication::translate("QtVersion", "Qt version is not properly installed, please run make install"); if (!m_versionInfo.contains("QT_INSTALL_BINS")) - return QCoreApplication::translate("QtVersion", "Could not determine qt install binary, maybe the qmake path is wrong?"); + return QCoreApplication::translate("QtVersion", + "Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?"); return QString(); } diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp index e84fcd27f8e..812dcd9ce1c 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp @@ -54,8 +54,8 @@ TestWizardDialog::TestWizardDialog(const QString &templateName, BaseQt4ProjectWizardDialog(true, parent), m_testPage(new TestWizardPage) { - setIntroDescription(tr("This wizard generates a Qt4 unit test " - "consisting of a single source file with a test object.")); + setIntroDescription(tr("This wizard generates a Qt unit test " + "consisting of a single source file with a test class.")); setWindowIcon(icon); setWindowTitle(templateName); setSelectedModules(QLatin1String("core testlib"), true);