BlackBerry: fix UI text and messages

Fix punctuation and capitalization in UI text and
messages.

Change-Id: Ie3beaeda820090ecec94832b773c2f29a7bd0d95
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.ui

@@ -17,14 +17,14 @@
    <item>
     <widget class="QCheckBox" name="checkRuntime">
      <property name="text">
-      <string>Check Device Runtime</string>
+      <string>Check device runtime</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="checkDebugToken">
      <property name="text">
-      <string>Check Debug Token</string>
+      <string>Check debug token</string>
      </property>
     </widget>
    </item>

src/plugins/qnx/blackberrycreatepackagestep.cpp

@@ -95,7 +95,7 @@ bool BlackBerryCreatePackageStep::init()
 
     const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD));
     if (packageCmd.isEmpty()) {
-        raiseError(tr("Could not find packager command '%1' in the build environment")
+        raiseError(tr("Could not find packager command '%1' in the build environment.")
                    .arg(QLatin1String(PACKAGER_CMD)));
         return false;
     }
@@ -105,18 +105,18 @@ bool BlackBerryCreatePackageStep::init()
 
     QList<BarPackageDeployInformation> packagesToDeploy = deployConfig->deploymentInfo()->enabledPackages();
     if (packagesToDeploy.isEmpty()) {
-        raiseError(tr("No packages enabled for deployment"));
+        raiseError(tr("No packages enabled for deployment."));
         return false;
     }
 
     foreach (const BarPackageDeployInformation &info, packagesToDeploy) {
         if (info.appDescriptorPath().isEmpty()) {
-            raiseError(tr("Application descriptor file not specified, please check deployment settings"));
+            raiseError(tr("BAR application descriptor file not specified. Check deployment settings."));
             return false;
         }
 
         if (info.packagePath().isEmpty()) {
-            raiseError(tr("No package specified, please check deployment settings"));
+            raiseError(tr("No package specified. Check deployment settings."));
             return false;
         }
 
@@ -124,7 +124,7 @@ bool BlackBerryCreatePackageStep::init()
         QDir dir(buildDir);
         if (!dir.exists()) {
             if (!dir.mkpath(buildDir)) {
-                raiseError(tr("Could not create build directory '%1'").arg(buildDir));
+                raiseError(tr("Could not create build directory '%1'.").arg(buildDir));
                 return false;
             }
         }
@@ -146,7 +146,7 @@ bool BlackBerryCreatePackageStep::init()
                 dlg.setCskPassword(m_cskPassword);
                 dlg.setStorePassword(m_keystorePassword);
                 if (dlg.exec() == QDialog::Rejected) {
-                    raiseError(tr("Missing passwords for signing packages"));
+                    raiseError(tr("Missing passwords for signing packages."));
                     return false;
                 }
 
@@ -170,7 +170,7 @@ bool BlackBerryCreatePackageStep::init()
                     (QtSupport::QtKitInformation::qtVersion(target()->kit()));
             if (!qtVersion) {
                 raiseError(tr("Qt version configured for BlackBerry kit "
-                              "is not a BlackBerry Qt version"));
+                              "is not a BlackBerry Qt version."));
                 return false;
             }
 
@@ -317,14 +317,14 @@ bool BlackBerryCreatePackageStep::prepareAppDescriptorFile(const QString &appDes
 {
     BlackBerryQtVersion *qtVersion = dynamic_cast<BlackBerryQtVersion *>(QtSupport::QtKitInformation::qtVersion(target()->kit()));
     if (!qtVersion) {
-        raiseError(tr("Error preparing application descriptor file"));
+        raiseError(tr("Error preparing BAR application descriptor file."));
         return false;
     }
 
     BarDescriptorDocument doc;
     QString errorString;
     if (!doc.open(&errorString, appDescriptorPath)) {
-        raiseError(tr("Error opening application descriptor file '%1' - %2")
+        raiseError(tr("Error opening BAR application descriptor file '%1' - %2")
             .arg(QDir::toNativeSeparators(appDescriptorPath))
             .arg(errorString));
         return false;
@@ -396,7 +396,7 @@ bool BlackBerryCreatePackageStep::prepareAppDescriptorFile(const QString &appDes
 
     doc.setFilePath(preparedFilePath);
     if (!doc.save(&errorString)) {
-        raiseError(tr("Error saving prepared application descriptor file '%1' - %2")
+        raiseError(tr("Error saving prepared BAR application descriptor file '%1' - %2")
             .arg(QDir::toNativeSeparators(preparedFilePath))
             .arg(errorString));
         return false;

src/plugins/qnx/blackberrycreatepackagestepconfigwidget.cpp

@@ -58,9 +58,9 @@ BlackBerryCreatePackageStepConfigWidget::BlackBerryCreatePackageStepConfigWidget
     m_qtLibraryExplanations[1] = tr("Include Qt libraries in the package. "
                                     "This will increase the package size.");
     m_qtLibraryExplanations[2] = tr("Use deployed Qt libraries on the device.");
-    m_ui->qtLibrary->addItem(tr("Use pre-installed Qt"), BlackBerryCreatePackageStep::PreInstalledQt);
+    m_ui->qtLibrary->addItem(tr("Use Pre-installed Qt"), BlackBerryCreatePackageStep::PreInstalledQt);
-    m_ui->qtLibrary->addItem(tr("Bundle Qt in package"), BlackBerryCreatePackageStep::BundleQt);
+    m_ui->qtLibrary->addItem(tr("Bundle Qt in Package"), BlackBerryCreatePackageStep::BundleQt);
-    m_ui->qtLibrary->addItem(tr("Use deployed Qt"), BlackBerryCreatePackageStep::DeployedQt);
+    m_ui->qtLibrary->addItem(tr("Use Deployed Qt"), BlackBerryCreatePackageStep::DeployedQt);
 
     connect(m_ui->signPackages, SIGNAL(toggled(bool)), this, SLOT(setPackageMode(bool)));
     connect(m_ui->cskPassword, SIGNAL(textChanged(QString)), m_step, SLOT(setCskPassword(QString)));

src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui

@@ -178,7 +178,7 @@
       <item row="0" column="3">
        <widget class="QPushButton" name="deployNowButton">
         <property name="text">
-         <string>Deploy now</string>
+         <string>Deploy Now</string>
         </property>
        </widget>
       </item>

src/plugins/qnx/blackberrydebugtokenpinsdialog.ui

@@ -19,7 +19,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Debug Token: &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Debug token: &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>

src/plugins/qnx/blackberrydeployconfiguration.cpp

@@ -111,10 +111,10 @@ void BlackBerryDeployConfiguration::setupBarDescriptor()
 
         QDialogButtonBox::StandardButton button = Utils::CheckableMessageBox::question(Core::ICore::mainWindow(),
                                              tr("Setup Application Descriptor File"),
-                                             tr("You need to set up a bar descriptor file to enable "
+                                             tr("You need to set up a BAR descriptor file to enable "
                                                 "packaging.\nDo you want Qt Creator to generate it for your project (%1)?")
                                                                                        .arg(target()->project()->projectFilePath()),
-                                             tr("Don't ask again for this project"), &m_appBarDesciptorSetup);
+                                             tr("Don not ask again for this project"), &m_appBarDesciptorSetup);
 
         if (button == QDialogButtonBox::No)
             return;
@@ -132,7 +132,7 @@ void BlackBerryDeployConfiguration::setupBarDescriptor()
         if (!reader.fetch(barDescriptorTemplate)) {
             QMessageBox::warning(Core::ICore::mainWindow(),
                                  tr("Cannot Set up Application Descriptor File"),
-                                 tr("Reading the bar descriptor template failed."),
+                                 tr("Reading the BAR descriptor template failed."),
                                  QMessageBox::Ok);
             return;
         }
@@ -152,7 +152,7 @@ void BlackBerryDeployConfiguration::setupBarDescriptor()
         if (!writer.finalize()) {
             QMessageBox::warning(Core::ICore::mainWindow(),
                                  tr("Cannot Set up Application Descriptor File"),
-                                 tr("Writing the bar descriptor file failed."),
+                                 tr("Writing the BAR descriptor file failed."),
                                  QMessageBox::Ok);
             return;
         }

src/plugins/qnx/blackberrydeployqtlibrariesdialog.cpp

@@ -195,7 +195,7 @@ void BlackBerryDeployQtLibrariesDialog::handleRemoteProcessCompleted()
         // Directory exists
         if (m_processRunner->processExitCode() == 0) {
             int answer = QMessageBox::question(this, windowTitle(),
-                                               tr("The remote directory '%1' already exist. "
+                                               tr("The remote directory '%1' already exists. "
                                                   "Deploying to that directory will remove any files "
                                                   "already present.\n\n"
                                                   "Are you sure you want to continue?")

src/plugins/qnx/blackberrydeployqtlibrariesdialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Deploy Qt to BlackBerry device</string>
+   <string>Deploy Qt to BlackBerry Device</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp

@@ -132,7 +132,7 @@ void BlackBerryDeviceConfigurationWidget::debugTokenEditingFinished()
 void BlackBerryDeviceConfigurationWidget::importDebugToken()
 {
     const QString debugToken = QFileDialog::getOpenFileName(this, tr("Select Debug Token"),
-                                                            QString(), tr("Bar file (*.bar)"));
+                                                            QString(), tr("BAR file (*.bar)"));
 
     if (debugToken.isEmpty())
         return;

src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp

@@ -265,7 +265,7 @@ void BlackBerryDeviceConfigurationWizardQueryPage::processQueryFinished(int stat
         checkAndGenerateSSHKeys();
     else
         setState(Done, tr("Cannot connect to the device. "
-                "Check if the device is in development mode and has matching host name and password."));
+                "Check that the device is in development mode and has matching host name and password."));
 }
 
 void BlackBerryDeviceConfigurationWizardQueryPage::checkAndGenerateSSHKeys()
@@ -415,7 +415,7 @@ void BlackBerryDeviceConfigurationWizardConfigPage::generateDebugToken()
 void BlackBerryDeviceConfigurationWizardConfigPage::importDebugToken()
 {
     const QString debugToken = QFileDialog::getOpenFileName(this, tr("Select Debug Token"),
-                                                            QString(), tr("Bar file (*.bar)"));
+                                                            QString(), tr("BAR file (*.bar)"));
 
     if (debugToken.isEmpty())
         return;

src/plugins/qnx/blackberryinstallwizardoptionpage.ui

@@ -19,7 +19,7 @@
      <item>
       <widget class="QRadioButton" name="apiLevelButton">
        <property name="text">
-        <string>Install API Level</string>
+        <string>Install API level</string>
        </property>
       </widget>
      </item>
@@ -46,14 +46,14 @@
          <item>
           <widget class="QRadioButton" name="installButton">
            <property name="text">
-            <string>Install New Target</string>
+            <string>Install new target</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="addButton">
            <property name="text">
-            <string>Add Existing Target</string>
+            <string>Add existing target</string>
            </property>
           </widget>
          </item>
@@ -64,14 +64,14 @@
      <item>
       <widget class="QRadioButton" name="simulatorButton">
        <property name="text">
-        <string>Install Simulator</string>
+        <string>Install simulator</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="runtimeButton">
        <property name="text">
-        <string>Install Runtime</string>
+        <string>Install runtime</string>
        </property>
       </widget>
      </item>

src/plugins/qnx/blackberryndksettingswidget.cpp

@@ -307,7 +307,7 @@ void BlackBerryNDKSettingsWidget::updateUi(QTreeWidgetItem *item)
     m_ui->informationBox->setVisible(true);
     m_ui->informationBox->setTitle(isRuntimeItem ?
                                        tr("Runtime Information") : tr("API Level Information"));
-    m_ui->pathLabel->setText(isRuntimeItem ? tr("Path:") : tr("Environment File:"));
+    m_ui->pathLabel->setText(isRuntimeItem ? tr("Path:") : tr("Environment file:"));
     m_ui->hostLabel->setVisible(!isRuntimeItem);
     m_ui->host->setVisible(!isRuntimeItem);
     m_ui->targetLabel->setVisible(!isRuntimeItem);
@@ -411,7 +411,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo()
 
     QList<BlackBerryApiLevelConfiguration*> configurations = m_bbConfigManager.apiLevels();
 
-    m_ui->apiLevelCombo->addItem(tr("Newest version"),
+    m_ui->apiLevelCombo->addItem(tr("Newest Version"),
             QVariant::fromValue(static_cast<void*>(0)));
 
     if (configurations.isEmpty())

src/plugins/qnx/qnxplugin.cpp

@@ -123,13 +123,13 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
     Core::MimeGlobPattern barDescriptorGlobPattern(QLatin1String("*.xml"), Core::MimeGlobPattern::MinWeight + 1);
     Core::MimeType barDescriptorMimeType;
     barDescriptorMimeType.setType(QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE));
-    barDescriptorMimeType.setComment(tr("Bar descriptor file (BlackBerry)"));
+    barDescriptorMimeType.setComment(tr("BAR descriptor file (BlackBerry)"));
     barDescriptorMimeType.setGlobPatterns(QList<Core::MimeGlobPattern>() << barDescriptorGlobPattern);
     barDescriptorMimeType.addMagicMatcher(QSharedPointer<Core::IMagicMatcher>(new BarDescriptorMagicMatcher));
     barDescriptorMimeType.setSubClassesOf(QStringList() << QLatin1String("application/xml"));
 
     if (!Core::MimeDatabase::addMimeType(barDescriptorMimeType)) {
-        *errorString = tr("Could not add mime-type for bar-descriptor.xml editor.");
+        *errorString = tr("Could not add MIME type for bar-descriptor.xml editor.");
         return false;
     }
     addAutoReleasedObject(new BarDescriptorEditorFactory);
@@ -142,13 +142,13 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
 void QNXPlugin::extensionsInitialized()
 {
     ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
-                                          tr("Bar Descriptor"));
+                                          tr("BAR Descriptor"));
 
     // Debug support
     QnxAttachDebugSupport *debugSupport = new QnxAttachDebugSupport(this);
 
     m_attachToQnxApplication = new QAction(this);
-    m_attachToQnxApplication->setText(tr("Attach to Remote QNX Application..."));
+    m_attachToQnxApplication->setText(tr("Attach to remote QNX application..."));
     connect(m_attachToQnxApplication, SIGNAL(triggered()), debugSupport, SLOT(showProcessesDialog()));
 
     const Core::Context globalcontext(Core::Constants::C_GLOBAL);