From 4aeedd4dedfc895900af4a79f9fd8ca4cda729f6 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 9 Oct 2013 17:19:10 +0200 Subject: [PATCH] BlackBerry: fix UI text capitalization and punctuation Reword an info message to fix a language issue. Change-Id: I42719b2c407c42aad811370dbde8e9d422b7a4bb Reviewed-by: Alejandro Exojo Piqueras Reviewed-by: Nicolas Arnaud-Cormos --- src/plugins/qnx/blackberryconfiguration.cpp | 2 +- src/plugins/qnx/blackberryconfigurationmanager.cpp | 2 +- src/plugins/qnx/blackberrycreatecertificatedialog.cpp | 10 +++++----- .../blackberrydeviceconfigurationwizardconfigpage.ui | 4 ++-- src/plugins/qnx/blackberryinstallwizardpages.cpp | 4 ++-- src/plugins/qnx/blackberrykeyswidget.ui | 6 +++--- src/plugins/qnx/blackberrysigningutils.cpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp index c000b29afca..228df755499 100644 --- a/src/plugins/qnx/blackberryconfiguration.cpp +++ b/src/plugins/qnx/blackberryconfiguration.cpp @@ -310,7 +310,7 @@ bool BlackBerryConfiguration::activate() if (m_isAutoDetected) return false; - QString errorMessage = tr("The following errors occurred while activating Target: %1").arg(m_targetName); + QString errorMessage = tr("The following errors occurred while activating target: %1").arg(m_targetName); if (m_qmake4BinaryFile.isEmpty() && m_qmake5BinaryFile.isEmpty()) errorMessage += QLatin1Char('\n') + tr("- No Qt version found."); diff --git a/src/plugins/qnx/blackberryconfigurationmanager.cpp b/src/plugins/qnx/blackberryconfigurationmanager.cpp index fab197f2599..c8a99e844d1 100644 --- a/src/plugins/qnx/blackberryconfigurationmanager.cpp +++ b/src/plugins/qnx/blackberryconfigurationmanager.cpp @@ -216,7 +216,7 @@ bool BlackBerryConfigurationManager::addConfiguration(BlackBerryConfiguration *c if (c->ndkPath() == config->ndkPath() && c->targetName() == config->targetName()) { if (!config->isAutoDetected()) - QMessageBox::warning(0, tr("NDK Already known"), + QMessageBox::warning(0, tr("NDK Already Known"), tr("The NDK already has a configuration."), QMessageBox::Ok); return false; } diff --git a/src/plugins/qnx/blackberrycreatecertificatedialog.cpp b/src/plugins/qnx/blackberrycreatecertificatedialog.cpp index 8c761d161bd..1d61daed124 100644 --- a/src/plugins/qnx/blackberrycreatecertificatedialog.cpp +++ b/src/plugins/qnx/blackberrycreatecertificatedialog.cpp @@ -172,20 +172,20 @@ void BlackBerryCreateCertificateDialog::certificateCreated(int status) accept(); return; case BlackBerryCertificate::Busy: - errorMessage = tr("The blackberry-keytool process is already running"); + errorMessage = tr("The blackberry-keytool process is already running."); break; case BlackBerryCertificate::WrongPassword: - errorMessage = tr("The password entered is invalid"); + errorMessage = tr("The password entered is invalid."); break; case BlackBerryCertificate::PasswordTooSmall: - errorMessage = tr("The password entered is too small"); + errorMessage = tr("The password entered is too short."); break; case BlackBerryCertificate::InvalidOutputFormat: - errorMessage = tr("Invalid output format"); + errorMessage = tr("Invalid output format."); break; case BlackBerryCertificate::Error: default: - errorMessage = tr("An unknown error occurred"); + errorMessage = tr("An unknown error occurred."); break; } diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardconfigpage.ui b/src/plugins/qnx/blackberrydeviceconfigurationwizardconfigpage.ui index e59a39eba4a..386882cbc3c 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardconfigpage.ui +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardconfigpage.ui @@ -52,7 +52,7 @@ - Debug Token is needed for BlackBerry applications deployment to a device. + Debug token is needed for deploying applications to BlackBerry devices. true @@ -120,7 +120,7 @@ - Host name/IP: + Host name or IP address: diff --git a/src/plugins/qnx/blackberryinstallwizardpages.cpp b/src/plugins/qnx/blackberryinstallwizardpages.cpp index 442f91feec5..39033251d5a 100644 --- a/src/plugins/qnx/blackberryinstallwizardpages.cpp +++ b/src/plugins/qnx/blackberryinstallwizardpages.cpp @@ -100,8 +100,8 @@ BlackBerryInstallWizardOptionPage::BlackBerryInstallWizardOptionPage(BlackBerryI void BlackBerryInstallWizardOptionPage::initializePage() { - m_installButton->setText(tr("Install a new target")); - m_addButton->setText(tr("Add an existing target")); + m_installButton->setText(tr("Install New Target")); + m_addButton->setText(tr("Add Existing Target")); if (m_data.mode == BlackBerryInstallerDataHandler::ManuallMode) m_addButton->setChecked(true); diff --git a/src/plugins/qnx/blackberrykeyswidget.ui b/src/plugins/qnx/blackberrykeyswidget.ui index da510fff6eb..7d1db06b974 100644 --- a/src/plugins/qnx/blackberrykeyswidget.ui +++ b/src/plugins/qnx/blackberrykeyswidget.ui @@ -156,21 +156,21 @@ - Open certificate + Open Certificate - Clear certificate + Clear Certificate - Create certificate + Create Certificate diff --git a/src/plugins/qnx/blackberrysigningutils.cpp b/src/plugins/qnx/blackberrysigningutils.cpp index 646205ae3e8..9905d7515c1 100644 --- a/src/plugins/qnx/blackberrysigningutils.cpp +++ b/src/plugins/qnx/blackberrysigningutils.cpp @@ -85,7 +85,7 @@ bool BlackBerrySigningUtils::hasDefaultCertificate() QString BlackBerrySigningUtils::cskPassword() { if (m_cskPassword.isEmpty()) - m_cskPassword = promptPassword(tr("Please provide your bbidtoken.csk PIN")); + m_cskPassword = promptPassword(tr("Please provide your bbidtoken.csk PIN.")); return m_cskPassword; } @@ -93,7 +93,7 @@ QString BlackBerrySigningUtils::cskPassword() QString BlackBerrySigningUtils::certificatePassword() { if (m_certificatePassword.isEmpty()) - m_certificatePassword = promptPassword(tr("Please enter your certificate password")); + m_certificatePassword = promptPassword(tr("Please enter your certificate password.")); return m_certificatePassword; }