tr()-fixes for 2.6.

- Fix typos and various capitalization errors.
- Fix wrong placeholders.
- Remove QCoreApplication::tr().
- Fix androidpackagecreationwidget.ui, remove translation
  from combo and clean up some HTML markup.

Change-Id: I51bcdad90c770c0f861a9d17e92b9c9222c6e8bf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

src/plugins/android/androidconfigurations.cpp

@@ -438,9 +438,9 @@ bool AndroidConfigurations::createAVD(int minApiLevel) const
     QStringListModel model(sdkTargets(minApiLevel));
     avdDialog.targetComboBox->setModel(&model);
     if (!model.rowCount()) {
-        QMessageBox::critical(0, tr("Create AVD Error"),
-                              tr("Cannot create a new AVD, not enough android SDKs available\n"
-                                 "Please install one SDK with api version >=%1").
+        QMessageBox::critical(0, tr("Error Creating AVD"),
+                              tr("Cannot create a new AVD, no sufficiently recent Android SDK available.\n"
+                                 "Please install an SDK of at least API version %1.").
                               arg(minApiLevel));
         return false;
     }

src/plugins/android/androiddeploystep.cpp

@@ -250,12 +250,12 @@ bool AndroidDeployStep::deployPackage()
         SLOT(handleBuildError()));
 
     if (m_runDeployAction == DeployLocal) {
-        writeOutput(tr("Clean old Qt libs"));
+        writeOutput(tr("Clean old Qt libraries"));
         runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
                    QStringList() << QLatin1String("-s") << m_deviceSerialNumber
                    << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt"));
 
-        writeOutput(tr("Deploy Qt libs ... this may take some time, please wait"));
+        writeOutput(tr("Deploy Qt libraries ... this may take some time, please wait"));
         const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName;
         AndroidPackageCreationStep::removeDirectory(tempPath);
         QStringList stripFiles;
@@ -279,7 +279,7 @@ bool AndroidDeployStep::deployPackage()
         if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
                         QStringList() << QLatin1String("-s") << m_deviceSerialNumber
                         << QLatin1String("install") << QLatin1String("-r ") << m_runQASIPackagePath)) {
-            raiseError(tr("Qt Android smart installer instalation failed"));
+            raiseError(tr("Qt Android smart installer installation failed"));
             disconnect(deployProc, 0, this, 0);
             deployProc->deleteLater();
             return false;
@@ -299,7 +299,7 @@ bool AndroidDeployStep::deployPackage()
 
     if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
                     QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) {
-        raiseError(tr("Package instalation failed"));
+        raiseError(tr("Package installation failed"));
         disconnect(deployProc, 0, this, 0);
         deployProc->deleteLater();
         return false;

src/plugins/android/androiddeploystepwidget.ui

@@ -23,10 +23,10 @@
    <item row="0" column="0">
     <widget class="QRadioButton" name="devicesQtLibs">
      <property name="toolTip">
-      <string>Use devices qt libs</string>
+      <string>Use Qt libraries from device</string>
      </property>
      <property name="text">
-      <string>Use device's Qt libs</string>
+      <string>Use Qt libraries from device</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -38,21 +38,21 @@
      <item>
       <widget class="QRadioButton" name="deployQtLibs">
        <property name="toolTip">
-        <string>Push local qt libs to device.
-You must have Qt libs compiled for that platform</string>
+        <string>Push local Qt libraries to device.
+You must have Qt libraries compiled for that platform</string>
        </property>
        <property name="text">
-        <string>Deploy local Qt libs</string>
+        <string>Deploy local Qt libraries</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QCheckBox" name="useLocalQtLibs">
        <property name="toolTip">
-        <string>Check this option to force the application to use local qt libs instead of system libs.</string>
+        <string>Check this option to force the application to use local Qt libraries instead of system libraries.</string>
        </property>
        <property name="text">
-        <string>Use local Qt libs</string>
+        <string>Use local Qt libraries</string>
        </property>
       </widget>
      </item>
@@ -70,7 +70,7 @@ You must have Qt libs compiled for that platform</string>
      <item>
       <widget class="QRadioButton" name="installQASI">
        <property name="toolTip">
-        <string>Choose and install Ministro system wide qt shared libraries.
+        <string>Choose and install Ministro system wide Qt shared libraries.
 This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator).</string>
        </property>
        <property name="text">

src/plugins/android/androidpackagecreationstep.cpp

@@ -142,7 +142,7 @@ bool AndroidPackageCreationStep::init()
 {
     const Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
     if (!bc) {
-        raiseError(tr("Cannot create android package: current build configuration is not Qt4."));
+        raiseError(tr("Cannot create Android package: current build configuration is not Qt 4."));
         return false;
     }
     Qt4Project *project = static_cast<Qt4Project *>(target()->project());
@@ -188,15 +188,24 @@ BuildStepConfigWidget *AndroidPackageCreationStep::createConfigWidget()
     return new AndroidPackageCreationWidget(this);
 }
 
+static inline QString msgCannotFindElfInformation()
+{
+    return AndroidPackageCreationStep::tr("Cannot find ELF information");
+}
+
+static inline QString msgCannotFindExecutable(const QString &appPath)
+{
+    return AndroidPackageCreationStep::tr("Cannot find '%1'.\n"
+        "Please make sure your application is "
+        "built successfully and is selected in Application tab ('Run option').").arg(appPath);
+}
+
 void AndroidPackageCreationStep::checkRequiredLibraries()
 {
     QProcess readelfProc;
     QString appPath = AndroidManager::targetApplicationPath(target());
     if (!QFile::exists(appPath)) {
-        raiseError(tr("Cannot find read elf information"),
-                   tr("Cannot find '%1'.\n"
-                      "Please make sure your application is "
-                      "built successfully and is selected in Application tab ('Run option') ").arg(appPath));
+        raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(appPath));
         return;
     }
     readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(),
@@ -244,10 +253,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
 {
     QProcess readelfProc;
     if (!m_appPath.toFileInfo().exists()) {
-        raiseError(tr("Can't find read elf information"),
-                   tr("Can't find '%1'.\n"
-                      "Please make sure your application is "
-                      "built successfully and is selected in Application tab ('Run option') ").arg(m_appPath.toUserOutput()));
+        raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(m_appPath.toUserOutput()));
         return;
     }
     readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput());

src/plugins/android/androidqtversion.cpp

@@ -88,7 +88,8 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
 
 QString AndroidQtVersion::description() const
 {
-    return tr("Android::Internal::AndroidQtVersion", "Qt Version is meant for Android");
+    //: Qt Version is meant for Android
+    return tr("Android");
 }
 
 Core::FeatureSet AndroidQtVersion::availableFeatures() const

src/plugins/android/androidsettingswidget.cpp

@@ -78,6 +78,7 @@ QVariant AVDModel::headerData(int section, Qt::Orientation orientation, int role
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
         switch (section) {
             case 0:
+                //: AVD - Android Virtual Device
                 return tr("AVD Name");
             case 1:
                 return tr("AVD Target");
@@ -356,7 +357,7 @@ void AndroidSettingsWidget::browseAntLocation()
 void AndroidSettingsWidget::browseGdbLocation()
 {
     Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::ArmArchitecture);
-    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString()));
+    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString()));
     if (file.isEmpty())
         return;
     m_ui->GdbLocationLineEdit->setText(file.toUserOutput());
@@ -366,7 +367,7 @@ void AndroidSettingsWidget::browseGdbLocation()
 void AndroidSettingsWidget::browseGdbserverLocation()
 {
     Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::ArmArchitecture);
-    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString()));
+    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString()));
     if (file.isEmpty())
         return;
     m_ui->GdbserverLocationLineEdit->setText(file.toUserOutput());
@@ -376,7 +377,7 @@ void AndroidSettingsWidget::browseGdbserverLocation()
 void AndroidSettingsWidget::browseGdbLocationX86()
 {
     Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::X86Architecture);
-    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString()));
+    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString()));
     if (file.isEmpty())
         return;
     m_ui->GdbLocationLineEditx86->setText(file.toUserOutput());
@@ -386,7 +387,7 @@ void AndroidSettingsWidget::browseGdbLocationX86()
 void AndroidSettingsWidget::browseGdbserverLocationX86()
 {
     Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::X86Architecture);
-    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString()));
+    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString()));
     if (file.isEmpty())
         return;
     m_ui->GdbserverLocationLineEditx86->setText(file.toUserOutput());
@@ -396,7 +397,7 @@ void AndroidSettingsWidget::browseGdbserverLocationX86()
 void AndroidSettingsWidget::browseOpenJDKLocation()
 {
     Utils::FileName openJDKPath = AndroidConfigurations::instance().openJDKPath();
-    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK path"), openJDKPath.toString()));
+    Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK Path"), openJDKPath.toString()));
     if (file.isEmpty())
         return;
     m_ui->OpenJDKLocationLineEdit->setText(file.toUserOutput());

src/plugins/android/androidtoolchain.cpp

@@ -178,7 +178,7 @@ void AndroidToolChain::setQtVersionId(int id)
     setTargetAbi(version->qtAbis().at(0));
 
     toolChainUpdated();
-    setDisplayName(AndroidToolChainFactory::tr("Android Gcc for %1").arg(version->displayName()));
+    setDisplayName(AndroidToolChainFactory::tr("Android GCC for %1").arg(version->displayName()));
 }
 
 int AndroidToolChain::qtVersionId() const

src/plugins/qnx/blackberrycreatepackagestep.cpp

@@ -87,7 +87,7 @@ bool BlackBerryCreatePackageStep::init()
 
     const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD));
     if (packageCmd.isEmpty()) {
-        raiseError(tr("Could not find packager command '%s' in the build environment")
+        raiseError(tr("Could not find packager command '%1' in the build environment")
                    .arg(QLatin1String(PACKAGER_CMD)));
         return false;
     }

src/plugins/qnx/blackberrydeviceconfigurationwidget.ui

@@ -34,7 +34,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="passwordLabel">
      <property name="text">
-      <string>Device &amp;password</string>
+      <string>Device &amp;password:</string>
      </property>
      <property name="buddy">
       <cstring>pwdLineEdit</cstring>

src/plugins/qnx/qnxqtversion.cpp

@@ -64,7 +64,8 @@ QString QnxQtVersion::type() const
 
 QString QnxQtVersion::description() const
 {
-    return tr("QNX %1", "Qt Version is meant for QNX").arg(archString());
+    //: Qt Version is meant for QNX
+    return tr("QNX %1").arg(archString());
 }
 
 Core::FeatureSet QnxQtVersion::availableFeatures() const
@@ -81,12 +82,12 @@ QString QnxQtVersion::platformName() const
 
 QString QnxQtVersion::platformDisplayName() const
 {
-    return QCoreApplication::tr("QNX");
+    return tr("QNX");
 }
 
 QString QnxQtVersion::sdkDescription() const
 {
-    return QCoreApplication::tr("QNX Software Development Platform:");
+    return tr("QNX Software Development Platform:");
 }
 
 QMultiMap<QString, QString> QnxQtVersion::environment() const