summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-02-18 10:35:53 +0100
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2013-02-18 11:07:11 +0100
commit06d201a072a15373b45277c6f27b3a4e09d56eaa (patch)
tree93c075d3376133fcbc2896f3d618083933d845d0
parent4e3f83e3882ce9199beeaf0bfbd5b89e9049a1cb (diff)
downloadqt-creator-06d201a072a15373b45277c6f27b3a4e09d56eaa.tar.gz
UI text: fix capitalization and punctuation
Use book style capitalization for titles. Use periods in the ends of messages (avoid exclamation marks). Idiomatic usage for "errors" is to "occur", not "happen". Change-Id: I9eee6fabf8a52371eac9a8e577cbbc988a769b21 Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/plugins/qnx/blackberrycreatecertificatedialog.cpp8
-rw-r--r--src/plugins/qnx/blackberrycreatecertificatedialog.ui2
-rw-r--r--src/plugins/qnx/blackberrycsjregistrar.cpp10
-rw-r--r--src/plugins/qnx/blackberryimportcertificatedialog.cpp4
-rw-r--r--src/plugins/qnx/blackberryimportcertificatedialog.ui2
-rw-r--r--src/plugins/qnx/blackberrykeyswidget.cpp10
-rw-r--r--src/plugins/qnx/blackberryregisterkeydialog.cpp8
-rw-r--r--src/plugins/qnx/blackberryregisterkeydialog.ui2
8 files changed, 23 insertions, 23 deletions
diff --git a/src/plugins/qnx/blackberrycreatecertificatedialog.cpp b/src/plugins/qnx/blackberrycreatecertificatedialog.cpp
index 883ef267a7..5be8398c00 100644
--- a/src/plugins/qnx/blackberrycreatecertificatedialog.cpp
+++ b/src/plugins/qnx/blackberrycreatecertificatedialog.cpp
@@ -50,7 +50,7 @@ BlackBerryCreateCertificateDialog::BlackBerryCreateCertificateDialog(
m_ui->setupUi(this);
m_ui->progressBar->hide();
m_ui->certPath->setExpectedKind(Utils::PathChooser::Any);
- m_ui->certPath->setPromptDialogTitle(tr("Create certificate"));
+ m_ui->certPath->setPromptDialogTitle(tr("Create Certificate"));
m_ui->certPath->setPromptDialogFilter(tr("PKCS 12 archives (*.p12)"));
m_ui->status->clear();
@@ -112,13 +112,13 @@ void BlackBerryCreateCertificateDialog::validate()
QFileInfo fileInfo(m_ui->certPath->path());
if (!fileInfo.dir().exists()) {
- m_ui->status->setText(tr("Base directory does not exist"));
+ m_ui->status->setText(tr("Base directory does not exist."));
m_okButton->setEnabled(false);
return;
}
if (m_ui->password->text() != m_ui->password2->text()) {
- m_ui->status->setText(tr("The entered passwords do not match"));
+ m_ui->status->setText(tr("The entered passwords do not match."));
m_okButton->setEnabled(false);
return;
}
@@ -182,7 +182,7 @@ void BlackBerryCreateCertificateDialog::certificateCreated(int status)
m_certificate->deleteLater();
m_certificate = 0;
QMessageBox::critical(this, tr("Error"),
- tr("An unknown error happened while creating the certificate"));
+ tr("An unknown error occurred while creating the certificate."));
reject();
}
}
diff --git a/src/plugins/qnx/blackberrycreatecertificatedialog.ui b/src/plugins/qnx/blackberrycreatecertificatedialog.ui
index 1948d2d058..521ca6dda7 100644
--- a/src/plugins/qnx/blackberrycreatecertificatedialog.ui
+++ b/src/plugins/qnx/blackberrycreatecertificatedialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Create certificate</string>
+ <string>Create Certificate</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/plugins/qnx/blackberrycsjregistrar.cpp b/src/plugins/qnx/blackberrycsjregistrar.cpp
index 7643b145e9..3a270a2a87 100644
--- a/src/plugins/qnx/blackberrycsjregistrar.cpp
+++ b/src/plugins/qnx/blackberrycsjregistrar.cpp
@@ -92,19 +92,19 @@ void BlackBerryCsjRegistrar::processError(QProcess::ProcessError error)
switch (error) {
case QProcess::FailedToStart:
- errorMessage = tr("Failed to start blackberry-signer process");
+ errorMessage = tr("Failed to start blackberry-signer process.");
break;
case QProcess::Timedout:
- errorMessage = tr("Process timed out");
+ errorMessage = tr("Process timed out.");
case QProcess::Crashed:
- errorMessage = tr("Child process has crashed");
+ errorMessage = tr("Child process has crashed.");
break;
case QProcess::WriteError:
case QProcess::ReadError:
- errorMessage = tr("Process I/O error");
+ errorMessage = tr("Process I/O error.");
break;
case QProcess::UnknownError:
- errorMessage = tr("Unknown process error");
+ errorMessage = tr("Unknown process error.");
break;
}
diff --git a/src/plugins/qnx/blackberryimportcertificatedialog.cpp b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
index f362475ca6..95f9eb5d73 100644
--- a/src/plugins/qnx/blackberryimportcertificatedialog.cpp
+++ b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
@@ -119,10 +119,10 @@ void BlackBerryImportCertificateDialog::certificateLoaded(int status)
if (status == BlackBerryCertificate::WrongPassword) {
QMessageBox::information(this, tr("Error"),
- tr("Invalid keystore password"));
+ tr("The keystore password is invalid."));
} else {
QMessageBox::information(this, tr("Error"),
- tr("An unknown error has happened"));
+ tr("An unknown error has occurred."));
}
} else {
m_author = m_certificate->author();
diff --git a/src/plugins/qnx/blackberryimportcertificatedialog.ui b/src/plugins/qnx/blackberryimportcertificatedialog.ui
index fd486bf4d1..26d08fcfdc 100644
--- a/src/plugins/qnx/blackberryimportcertificatedialog.ui
+++ b/src/plugins/qnx/blackberryimportcertificatedialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Import certificate</string>
+ <string>Import Certificate</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/plugins/qnx/blackberrykeyswidget.cpp b/src/plugins/qnx/blackberrykeyswidget.cpp
index 1d7c468443..87fd6cea51 100644
--- a/src/plugins/qnx/blackberrykeyswidget.cpp
+++ b/src/plugins/qnx/blackberrykeyswidget.cpp
@@ -92,7 +92,7 @@ void BlackBerryKeysWidget::registerKey()
if (cert) {
if (!m_model->insertCertificate(cert))
- QMessageBox::information(this, tr("Error"), tr("Could not insert default certificate"));
+ QMessageBox::information(this, tr("Error"), tr("Could not insert default certificate."));
}
updateRegisterSection();
@@ -102,7 +102,7 @@ void BlackBerryKeysWidget::unregisterKey()
{
const QMessageBox::StandardButton answer =
QMessageBox::question(this, tr("Unregister Key"),
- tr("Do you really want to unregister your key? This action cannot be undone!"),
+ tr("Do you really want to unregister your key? This action cannot be undone."),
QMessageBox::Yes | QMessageBox::No);
if (answer & QMessageBox::No)
@@ -132,7 +132,7 @@ void BlackBerryKeysWidget::createCertificate()
if (cert) {
if (!m_model->insertCertificate(cert))
- QMessageBox::information(this, tr("Error"), tr("Error storing certificate"));
+ QMessageBox::information(this, tr("Error"), tr("Error storing certificate."));
}
}
@@ -149,13 +149,13 @@ void BlackBerryKeysWidget::importCertificate()
if (cert) {
if (!m_model->insertCertificate(cert))
- QMessageBox::information(this, tr("Error"), tr("This certificate already exists"));
+ QMessageBox::information(this, tr("Error"), tr("This certificate already exists."));
}
}
void BlackBerryKeysWidget::deleteCertificate()
{
- const int result = QMessageBox::question(this, tr("Delete certificate"),
+ const int result = QMessageBox::question(this, tr("Delete Certificate"),
tr("Are you sure you want to delete this certificate?"),
QMessageBox::Yes | QMessageBox::No);
diff --git a/src/plugins/qnx/blackberryregisterkeydialog.cpp b/src/plugins/qnx/blackberryregisterkeydialog.cpp
index 18379bf5a1..e2eeb1ac54 100644
--- a/src/plugins/qnx/blackberryregisterkeydialog.cpp
+++ b/src/plugins/qnx/blackberryregisterkeydialog.cpp
@@ -147,7 +147,7 @@ void BlackBerryRegisterKeyDialog::validate()
if (m_ui->cskPin->text() != m_ui->cskPin2->text()) {
m_okButton->setEnabled(false);
- m_ui->statusLabel->setText(tr("CSK PINs do not match"));
+ m_ui->statusLabel->setText(tr("CSK PINs do not match."));
return;
}
@@ -161,7 +161,7 @@ void BlackBerryRegisterKeyDialog::validate()
if (m_ui->keystorePassword->text()
!= m_ui->keystorePassword2->text()) {
- m_ui->statusLabel->setText(tr("Keystore password does not match"));
+ m_ui->statusLabel->setText(tr("Keystore password does not match."));
m_okButton->setEnabled(false);
return;
}
@@ -225,7 +225,7 @@ void BlackBerryRegisterKeyDialog::registrarFinished(int status,
void BlackBerryRegisterKeyDialog::certificateCreated(int status)
{
if (status == BlackBerryCertificate::Error) {
- QMessageBox::critical(this, tr("Error"), tr("Error creating developer certificate"));
+ QMessageBox::critical(this, tr("Error"), tr("Error creating developer certificate."));
cleanup();
m_certificate->deleteLater();
m_certificate = 0;
@@ -344,7 +344,7 @@ QString BlackBerryRegisterKeyDialog::getCsjAuthor(const QString &fileName) const
void BlackBerryRegisterKeyDialog::setupCsjPathChooser(Utils::PathChooser *chooser)
{
chooser->setExpectedKind(Utils::PathChooser::File);
- chooser->setPromptDialogTitle(tr("Browse CSJ file"));
+ chooser->setPromptDialogTitle(tr("Browse CSJ File"));
chooser->setPromptDialogFilter(tr("CSJ files (*.csj)"));
}
diff --git a/src/plugins/qnx/blackberryregisterkeydialog.ui b/src/plugins/qnx/blackberryregisterkeydialog.ui
index 936b46c6dd..5acbfc6317 100644
--- a/src/plugins/qnx/blackberryregisterkeydialog.ui
+++ b/src/plugins/qnx/blackberryregisterkeydialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Create key</string>
+ <string>Create Key</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>