From 3bf7578beb5e035d65194629fad3be76e48e28cd Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@digia.com>
Date: Fri, 4 Oct 2013 13:51:53 +0200
Subject: [PATCH] BareMetal plugin: fix UI text capitalization
Follow capitalization and punctuation guidelines
in UI strings and messages. Replace slashes with "or".
Change-Id: Icfe9d0ee4d2bb35423dbe16576150b992d00da4e
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui | 4 ++--
.../baremetal/baremetaldeviceconfigurationwizardpages.cpp | 2 +-
src/plugins/baremetal/baremetalrunconfiguration.cpp | 4 ++--
src/plugins/baremetal/baremetalrunconfigurationfactory.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
index 6abfdb57d83..17236089bec 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.ui
@@ -32,7 +32,7 @@
<locale language="English" country="UnitedStates"/>
</property>
<property name="text">
- <string>GDB Host:</string>
+ <string>GDB host:</string>
</property>
</widget>
</item>
@@ -45,7 +45,7 @@
<locale language="English" country="UnitedStates"/>
</property>
<property name="text">
- <string>GDB Port:</string>
+ <string>GDB port:</string>
</property>
</widget>
</item>
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
index 84f039c85ba..08d6254aef5 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
@@ -41,7 +41,7 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS
QWizardPage(parent), d(new Internal::BareMetalDeviceConfigurationWizardSetupPagePrivate)
{
d->ui.setupUi(this);
- setTitle(tr("Gdbserver/hardware debugger setup"));
+ setTitle(tr("Set up GDB Server or Hardware Debugger"));
setSubTitle(QLatin1String(" ")); // For Qt bug (background color)
connect(d->ui.hostNameLineEdit,SIGNAL(textChanged(QString)),SIGNAL(completeChanged()));
connect(d->ui.nameLineEdit,SIGNAL(textChanged(QString)),SIGNAL(completeChanged()));
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 14e0c6abf62..ca11d9ae451 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -157,9 +157,9 @@ QString BareMetalRunConfiguration::defaultDisplayName()
{
if (!d->projectFilePath.isEmpty())
//: %1 is the name of the project run via hardware debugger
- return tr("%1 (via gdbserver/hardware debugger)").arg(QFileInfo(d->projectFilePath).completeBaseName());
+ return tr("%1 (via GDB server or hardware debugger)").arg(QFileInfo(d->projectFilePath).completeBaseName());
//: Bare Metal run configuration default run name
- return tr("Run on gdbserver/hardware debugger");
+ return tr("Run on GDB server or hardware debugger");
}
QString BareMetalRunConfiguration::localExecutableFilePath() const
diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
index 96700490d66..5f611b1da96 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
+++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
@@ -98,7 +98,7 @@ QList<Core::Id> BareMetalRunConfigurationFactory::availableCreationIds(Target *p
QString BareMetalRunConfigurationFactory::displayNameForId(const Core::Id id) const
{
- return tr("%1 (on gdbserver/Hardware Debugger)")
+ return tr("%1 (on GDB server or hardware debugger)")
.arg(QFileInfo(pathFromId(id)).completeBaseName());
}
--
GitLab