tr()-Fixes for 2.3: No contractions, spelling.

Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index c040e64..4d29a0a 100644 (file)
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -447,7 +447,7 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
         }
         if (!fi.isExecutable()) {
             if (errorMessage)
-                *errorMessage = tr("Can not execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("Cannot execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;
@@ -461,7 +461,7 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
     case PathChooser::Command: // fall through
         if (fi.exists() && !fi.isExecutable()) {
             if (errorMessage)
-                *errorMessage = tr("Can not execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("Cannot execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
         break;

diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 9ede3f1..634a9a5 100644 (file)
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -856,7 +856,7 @@ void AnalyzerManager::updateRunActions()
     d->m_startAction->setEnabled(startEnabled);
     d->m_startAction->setToolTip(disabledReason);
     if (currentTool() && !currentTool()->canRunRemotely())
-        disabledReason = tr("Current analyzer tool can not be run remotely.");
+        disabledReason = tr("Current analyzer tool cannot be run remotely.");
     d->m_startRemoteAction->setEnabled(!d->m_currentRunControl && currentTool()
                                         && currentTool()->canRunRemotely());
     d->m_startRemoteAction->setToolTip(disabledReason);

diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 6f3dd29..e1e598e 100644 (file)
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -3603,7 +3603,7 @@ bool FakeVimHandler::Private::handleExSourceCommand(const ExCommand &cmd)
     QString fileName = cmd.args;
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly)) {
-        showRedMessage(FakeVimHandler::tr("Can't open file %1").arg(fileName));
+        showRedMessage(FakeVimHandler::tr("Cannot open file %1").arg(fileName));
         return true;
     }
 

diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 0da7c1c..4a44159 100644 (file)
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -91,7 +91,7 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(leftButtonClicked()));
     buttons << new QToolButton();
     buttons.last()->setIcon(QIcon(":/navigator/icon/arrowright.png"));
-    buttons.last()->setToolTip(tr("Become child of first silbing (CTRL + Right)"));
+    buttons.last()->setToolTip(tr("Become child of first sibling (CTRL + Right)"));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Right | Qt::CTRL));
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(rightButtonClicked()));
 

diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 86a0f4e..3890c04 100644 (file)
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -686,7 +686,7 @@ void QMakeStepConfigWidget::updateQmlDebuggingOption()
     if (!m_step->isQmlDebuggingLibrarySupported(&warningText))
         ;
     else if (m_step->linkQmlDebuggingLibrary())
-        warningText = tr("Might make your application vulnerable. Only use in a safe environment!");
+        warningText = tr("Might make your application vulnerable. Only use in a safe environment.");
 
     m_ui->qmlDebuggingWarningText->setText(warningText);
     m_ui->qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
@@ -696,7 +696,7 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
 {
     Qt4BuildConfiguration *qt4bc = m_step->qt4BuildConfiguration();
     QtSupport::BaseQtVersion *qtVersion = qt4bc->qtVersion();
-    QString program = tr("<No qtversion>");
+    QString program = tr("<No Qt version>");
     if (qtVersion)
         program = QFileInfo(qtVersion->qmakeCommand()).fileName();
     m_ui->qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + m_step->allArguments());

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
index 94e7f5d..d7bc5c5 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
@@ -143,7 +143,7 @@ void S60PublishingSisSettingsPageOvi::displayNameChanged()
                         ui->displayNameErrorLabel,
                         ui->displayNameErrorReasonLabel,
                         tr("This should be application's display name. <br>"
-                           "It can't' be empty.<br>"));
+                           "It cannot be empty.<br>"));
 
     const int visibleCharacters = 12;
     if (ui->displayNameLineEdit->text().length() > visibleCharacters) {

diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index d403ac6..4d389cc 100644 (file)
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -179,7 +179,7 @@ bool QtVersionManager::restoreQtVersions()
                 if (BaseQtVersion *qtv = f->restore(qtversionMap)) {
                     if (m_versions.contains(qtv->uniqueId())) {
                         // This shouldn't happen, we are restoring the same id multiple times?
-                        qWarning() << "A qt version with id"<<qtv->uniqueId()<<"already exists";
+                        qWarning() << "A Qt version with id"<<qtv->uniqueId()<<"already exists";
                         delete qtv;
                     } else {
                         m_versions.insert(qtv->uniqueId(), qtv);
@@ -191,7 +191,7 @@ bool QtVersionManager::restoreQtVersions()
             }
         }
         if (!restored)
-            qWarning("Warning: Unable to restore qtversion '%s' stored in %s.",
+            qWarning("Warning: Unable to restore Qt version '%s' stored in %s.",
                      qPrintable(type),
                      qPrintable(QDir::toNativeSeparators(settingsFileName())));
     }
@@ -212,7 +212,7 @@ void QtVersionManager::updateFromInstaller()
     QVariantMap data = reader.restoreValues();
 
     if (debug) {
-        qDebug()<< "======= Existing qt versions =======";
+        qDebug()<< "======= Existing Qt versions =======";
         foreach (BaseQtVersion *version, m_versions) {
             qDebug() << version->qmakeCommand() << "id:"<<version->uniqueId();
             qDebug() << "  autodetection source:"<< version->autodetectionSource();

diff --git a/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp b/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
index b0df2ce..5c5aae0 100644 (file)
--- a/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
@@ -149,7 +149,7 @@ void AbstractMaemoInstallPackageToSysrootStep::run(QFutureInterface<bool> &fi)
     const Qt4BuildConfiguration * const bc
         = qobject_cast<Qt4BaseTarget *>(target())->activeBuildConfiguration();
     if (!bc) {
-        addOutput(tr("Can't install to sysroot without build configuration."),
+        addOutput(tr("Cannot install to sysroot without build configuration."),
             ErrorMessageOutput);
         fi.reportResult(false);
         return;
@@ -158,14 +158,14 @@ void AbstractMaemoInstallPackageToSysrootStep::run(QFutureInterface<bool> &fi)
     const AbstractMaemoPackageCreationStep * const pStep
         = MaemoGlobal::earlierBuildStep<AbstractMaemoPackageCreationStep>(deployConfiguration(), this);
     if (!pStep) {
-        addOutput(tr("Can't install package to sysroot without packaging step."),
+        addOutput(tr("Cannot install package to sysroot without packaging step."),
             ErrorMessageOutput);
         fi.reportResult(false);
         return;
     }
 
     if (!bc->qtVersion()) {
-        addOutput(tr("Can't install package to sysroot without a qt version."),
+        addOutput(tr("Cannot install package to sysroot without a Qt version."),
             ErrorMessageOutput);
         fi.reportResult(false);
         return;
@@ -297,7 +297,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
     const Qt4BuildConfiguration * const bc
         = qobject_cast<Qt4BaseTarget *>(target())->activeBuildConfiguration();
     if (!bc) {
-        addOutput(tr("Can't copy to sysroot without build configuration."),
+        addOutput(tr("Cannot copy to sysroot without build configuration."),
             ErrorMessageOutput);
         fi.reportResult(false);
         return;
@@ -305,7 +305,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
 
     const MaemoQtVersion * const qtVersion = dynamic_cast<MaemoQtVersion *>(bc->qtVersion());
     if (!qtVersion) {
-        addOutput(tr("Can't copy to sysroot without valid Qt version."),
+        addOutput(tr("Cannot copy to sysroot without valid Qt version."),
             ErrorMessageOutput);
         fi.reportResult(false);
         return;
@@ -368,13 +368,13 @@ bool MaemoMakeInstallToSysrootStep::init()
     const Qt4BuildConfiguration * const bc
         = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
     if (!bc) {
-        addOutput("Can't deploy: No active build dconfiguration.",
+        addOutput("Cannot deploy: No active build dconfiguration.",
             ErrorMessageOutput);
         return false;
     }
     const QtSupport::BaseQtVersion * const qtVersion = bc->qtVersion();
     if (!qtVersion) {
-        addOutput("Can't deploy: Unusable build configuration.",
+        addOutput("Cannot deploy: Unusable build configuration.",
             ErrorMessageOutput);
         return false;
 

diff --git a/src/plugins/remotelinux/maemopackagecreationstep.cpp b/src/plugins/remotelinux/maemopackagecreationstep.cpp
index 026aa79..36ebd8d 100644 (file)
--- a/src/plugins/remotelinux/maemopackagecreationstep.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationstep.cpp
@@ -258,7 +258,7 @@ bool AbstractMaemoPackageCreationStep::callPackagingCommand(QProcess *proc,
     preparePackagingProcess(proc, qt4BuildConfiguration(), buildDirectory());
     const QtSupport::BaseQtVersion * const qtVersion = qt4BuildConfiguration()->qtVersion();
     if (!qtVersion) {
-        raiseError(tr("Packaging failed."), tr("Packaging error: No qt version."));
+        raiseError(tr("Packaging failed."), tr("Packaging error: No Qt version."));
         return false;
     }
     const QString madCommand = MaemoGlobal::madCommand(qtVersion->qmakeCommand());

diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
index c630f11..9632428 100644 (file)
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -712,7 +712,7 @@ AbstractQt4MaemoTarget::ActionStatus AbstractDebBasedQt4MaemoTarget::createSpeci
             + AbstractMaemoPackageCreationStep::DefaultVersionNumber);
     QtSupport::BaseQtVersion *lqt = activeBuildConfiguration()->qtVersion();
     if (!lqt) {
-        raiseError(tr("Unable to create Debian templates: No qt version set"));
+        raiseError(tr("Unable to create Debian templates: No Qt version set"));
         return ActionFailed;
     }
     if (!MaemoGlobal::callMad(dh_makeProc, dh_makeArgs, lqt->qmakeCommand(), true)