L10n: tr-Fixes.

src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp

@@ -121,7 +121,7 @@ void MaemoPackageCreationWidget::updateVersionInfo(const ProjectExplorer::Projec
     QString error;
     QString versionString = m_step->versionString(&error);
     if (versionString.isEmpty()) {
-        QMessageBox::critical(this, tr("No version available."), error);
+        QMessageBox::critical(this, tr("No Version Available."), error);
         versionString = MaemoPackageCreationStep::DefaultVersionNumber;
     }
     const QStringList list = versionString.split(QLatin1Char('.'),
@@ -153,12 +153,12 @@ void MaemoPackageCreationWidget::setPackageManagerIcon()
         imageFilter += "*." + QString::fromAscii(imageType) + QLatin1Char(' ');
     imageFilter += QLatin1Char(')');
     const QString iconFileName = QFileDialog::getOpenFileName(this,
-        tr("Choose image"), QString(), imageFilter);
+        tr("Choose Image"), QString(), imageFilter);
     if (!iconFileName.isEmpty()) {
         QString error;
         if (!MaemoTemplatesManager::instance()->setPackageManagerIcon(m_step->
             buildConfiguration()->target()->project(), iconFileName, &error))
-            QMessageBox::critical(this, tr("Could not set new icon"), error);
+            QMessageBox::critical(this, tr("Could Not Set New Icon"), error);
     }
 }
 
@@ -202,7 +202,7 @@ void MaemoPackageCreationWidget::versionInfoChanged()
         + QLatin1Char('.') + m_ui->minor->text() + QLatin1Char('.')
         + m_ui->patch->text(), &error);
     if (!success)
-        QMessageBox::critical(this, tr("Could not set version number"), error);
+        QMessageBox::critical(this, tr("Could Not Set Version Number"), error);
 }
 
 void MaemoPackageCreationWidget::editDebianFile()

src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp

@@ -352,9 +352,10 @@ void MaemoRunConfigurationWidget::changeLocalMountDir(const QModelIndex &index)
 void MaemoRunConfigurationWidget::handleDebuggingTypeChanged(bool useGdb)
 {
     m_runConfiguration->setUseRemoteGdb(useGdb);
-    const QString detailsText = useGdb ? tr("Use gdb") : tr("Use gdbserver");
-    m_debugDetailsContainer->setSummaryText(tr("<b>Debugging details:</b> ")
-        + detailsText);
+    const QString detailsText = useGdb ?
+                tr("<b>Debugging details:</b> Use gdb") :
+                tr("<b>Debugging details:</b> Use gdbserver");
+    m_debugDetailsContainer->setSummaryText(detailsText);
 }
 
 void MaemoRunConfigurationWidget::fetchEnvironment()
@@ -421,8 +422,8 @@ void MaemoRunConfigurationWidget::handleRemoteMountsChanged()
         text = tr("One local directory to be mounted on the device.");
         break;
     default:
-        text = tr("%1 local directories to be mounted on the device.")
-            .arg(mountCount);
+        //: Note: Only mountCount>1  will occur here as 0, 1 are handled above.
+        text = tr("%n local directories to be mounted on the device.", 0, mountCount);
         break;
     }
     m_mountDetailsContainer->setSummaryText(QLatin1String("<b>") + text

src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp

@@ -683,12 +683,8 @@ void S60CreatePackageStepConfigWidget::resetPassphrases()
 {
     QMessageBox msgBox(QMessageBox::Question, tr("Reset passwords"),
                        tr("Do you want to reset all saved passwords for used keys?"),
-                       QMessageBox::Yes|QMessageBox::No, this);
-    msgBox.button(QMessageBox::Yes)->setText(tr("Reset"));
-    msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
-    msgBox.setDefaultButton(QMessageBox::No);
-    msgBox.setEscapeButton(QMessageBox::No);
-    if (msgBox.exec() == QMessageBox::Yes)
+                       QMessageBox::Reset|QMessageBox::Cancel, this);
+    if (msgBox.exec() == QMessageBox::Reset)
         m_signStep->resetPassphrases();
 }
 
@@ -699,8 +695,7 @@ QString S60CreatePackageStepConfigWidget::summaryText() const
         text = tr("self-signed");
     } else {
         text = tr("signed with certificate %1 and key file %2")
-               .arg(m_signStep->customSignaturePath())
-               .arg(m_signStep->customKeyPath());
+               .arg(m_signStep->customSignaturePath(), m_signStep->customKeyPath());
     }
     if (m_signStep->createsSmartInstaller())
         return tr("<b>Create SIS Package:</b> %1, using Smart Installer").arg(text);