Commit e902945b authored by Leena Miettinen's avatar Leena Miettinen

Android: fix UI text capitalization and punctuation

Fix typos and style issues.

Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent cf69783c
......@@ -167,7 +167,7 @@ void AndroidDeployQtStep::ctor()
bool AndroidDeployQtStep::init()
{
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
emit addOutput(tr("Found old android folder in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput);
emit addOutput(tr("Found old Android folder in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput);
m_targetArch = AndroidManager::targetArch(target());
if (m_targetArch.isEmpty()) {
......@@ -518,13 +518,13 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates()
keytoolProc.start(AndroidConfigurations::instance().keytoolPath().toString(), params);
if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) {
QMessageBox::critical(0, tr("Error"),
tr("Failed to run keytool"));
tr("Failed to run keytool."));
return 0;
}
if (keytoolProc.exitCode()) {
QMessageBox::critical(0, tr("Error"),
tr("Invalid password"));
tr("Invalid password."));
m_keystorePasswd.clear();
}
rawCerts = QString::fromLatin1(keytoolProc.readAllStandardOutput());
......
......@@ -174,7 +174,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="verboseOutputCheckBox">
<property name="text">
<string>Verbose Output</string>
<string>Verbose output</string>
</property>
</widget>
</item>
......@@ -210,7 +210,7 @@
<item row="0" column="0">
<widget class="QLabel" name="inputFileLabel">
<property name="text">
<string>Android deploy Qt Input File:</string>
<string>Android deploy Qt input file:</string>
</property>
</widget>
</item>
......@@ -309,7 +309,7 @@ The APK will not be usable on any other device.</string>
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="additionalLibrariesGroupBox">
<property name="title">
<string>Additional libraries</string>
<string>Additional Libraries</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
......@@ -317,7 +317,7 @@ The APK will not be usable on any other device.</string>
<item>
<widget class="QListView" name="androidExtraLibsListView">
<property name="toolTip">
<string>List of extra libraries to include in Android package and load on start-up.</string>
<string>List of extra libraries to include in Android package and load on startup.</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
......@@ -335,7 +335,7 @@ The APK will not be usable on any other device.</string>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select a library to include in package</string>
<string>Select library to include in package.</string>
</property>
<property name="text">
<string>Add</string>
......@@ -348,7 +348,7 @@ The APK will not be usable on any other device.</string>
<item>
<widget class="QToolButton" name="removeAndroidExtraLibButton">
<property name="toolTip">
<string>Remove currently selected library from list</string>
<string>Remove currently selected library from list.</string>
</property>
<property name="text">
<string>Remove</string>
......
......@@ -633,7 +633,7 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *
}
if (forceUpdate)
QMessageBox::warning(0, tr("Warning"), tr("Android files have been updated automatically"));
QMessageBox::warning(0, tr("Warning"), tr("Android files have been updated automatically."));
return true;
}
......@@ -936,7 +936,7 @@ bool AndroidManager::saveLibsXml(ProjectExplorer::Target *target, QDomDocument &
void AndroidManager::raiseError(const QString &reason)
{
QMessageBox::critical(0, tr("Error creating Android templates"), reason);
QMessageBox::critical(0, tr("Error creating Android templates."), reason);
}
QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel, ItemType item, const QString &attribute)
......@@ -1046,7 +1046,7 @@ bool AndroidManager::openXmlFile(QDomDocument &doc, const Utils::FileName &fileN
return false;
if (!doc.setContent(f.readAll())) {
raiseError(tr("Can't parse '%1'").arg(fileName.toUserOutput()));
raiseError(tr("Cannot parse '%1'.").arg(fileName.toUserOutput()));
return false;
}
return true;
......@@ -1059,7 +1059,7 @@ bool AndroidManager::saveXmlFile(ProjectExplorer::Target *target, QDomDocument &
QFile f(fileName.toString());
if (!f.open(QIODevice::WriteOnly)) {
raiseError(tr("Can't open '%1'").arg(fileName.toUserOutput()));
raiseError(tr("Cannot open '%1'.").arg(fileName.toUserOutput()));
return false;
}
return f.write(doc.toByteArray(4)) >= 0;
......@@ -1208,7 +1208,7 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
if (info.type == AndroidDeviceInfo::Emulator) {
deviceSerialNumber = AndroidConfigurations::instance().startAVD(deviceSerialNumber, deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty())
Core::MessageManager::write(tr("Starting android virtual device failed."));
Core::MessageManager::write(tr("Starting Android virtual device failed."));
}
QProcess *process = new QProcess();
......@@ -1237,7 +1237,7 @@ void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const Q
if (info.type == AndroidDeviceInfo::Emulator) {
deviceSerialNumber = AndroidConfigurations::instance().startAVD(deviceSerialNumber, deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty())
Core::MessageManager::write(tr("Starting android virtual device failed."));
Core::MessageManager::write(tr("Starting Android virtual device failed."));
}
QProcess *process = new QProcess();
......
......@@ -156,7 +156,7 @@ void AndroidManifestEditorWidget::initializePage()
m_packageNameLineEdit = new QLineEdit(packageGroupBox);
m_packageNameLineEdit->setToolTip(tr(
"<p align=\"justify\">Please choose a valid package name "
"for your application (e.g. \"org.example.myapplication\").</p>"
"for your application (for example, \"org.example.myapplication\").</p>"
"<p align=\"justify\">Packages are usually defined using a hierarchical naming pattern, "
"with levels in the hierarchy separated by periods (.) (pronounced \"dot\").</p>"
"<p align=\"justify\">In general, a package name begins with the top level domain name"
......@@ -203,8 +203,8 @@ void AndroidManifestEditorWidget::initializePage()
m_androidTargetSdkVersion = new QComboBox(packageGroupBox);
m_androidTargetSdkVersion->setToolTip(
tr("Sets the target SDK; set this to the highest tested version."
"This disables compatibility behavior of the system for your application."));
tr("Sets the target SDK. Set this to the highest tested version."
"This disables compatibility behavior of the system for your application."));
m_androidTargetSdkVersion->addItem(tr("Not set"), 0);
formLayout->addRow(tr("Target SDK:"), m_androidTargetSdkVersion);
......@@ -245,7 +245,7 @@ void AndroidManifestEditorWidget::initializePage()
m_lIconButton = new QToolButton(applicationGroupBox);
m_lIconButton->setMinimumSize(QSize(48, 48));
m_lIconButton->setMaximumSize(QSize(48, 48));
m_lIconButton->setToolTip(tr("Select low dpi icon"));
m_lIconButton->setToolTip(tr("Select low DPI icon."));
iconLayout->addWidget(m_lIconButton);
iconLayout->addItem(new QSpacerItem(28, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
......@@ -253,7 +253,7 @@ void AndroidManifestEditorWidget::initializePage()
m_mIconButton = new QToolButton(applicationGroupBox);
m_mIconButton->setMinimumSize(QSize(48, 48));
m_mIconButton->setMaximumSize(QSize(48, 48));
m_mIconButton->setToolTip(tr("Select medium dpi icon"));
m_mIconButton->setToolTip(tr("Select medium DPI icon."));
iconLayout->addWidget(m_mIconButton);
iconLayout->addItem(new QSpacerItem(28, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
......@@ -261,7 +261,7 @@ void AndroidManifestEditorWidget::initializePage()
m_hIconButton = new QToolButton(applicationGroupBox);
m_hIconButton->setMinimumSize(QSize(48, 48));
m_hIconButton->setMaximumSize(QSize(48, 48));
m_hIconButton->setToolTip(tr("Select high dpi icon"));
m_hIconButton->setToolTip(tr("Select high DPI icon."));
iconLayout->addWidget(m_hIconButton);
formLayout->addRow(tr("Application icon:"), iconLayout);
......@@ -653,13 +653,13 @@ bool AndroidManifestEditorWidget::checkDocument(QDomDocument doc, QString *error
{
QDomElement manifest = doc.documentElement();
if (manifest.tagName() != QLatin1String("manifest")) {
*errorMessage = tr("The structure of the android manifest file is corrupt. Expected a top level 'manifest' node.");
*errorMessage = tr("The structure of the Android manifest file is corrupted. Expected a top level 'manifest' node.");
*errorLine = -1;
*errorColumn = -1;
return false;
} else if (manifest.firstChildElement(QLatin1String("application")).firstChildElement(QLatin1String("activity")).isNull()) {
// missing either application or activity element
*errorMessage = tr("The structure of the Android manifest file is corrupt. Expected an 'application' and 'activity' sub node.");
*errorMessage = tr("The structure of the Android manifest file is corrupted. Expected an 'application' and 'activity' sub node.");
*errorLine = -1;
*errorColumn = -1;
return false;
......@@ -719,9 +719,9 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int
Core::InfoBar *infoBar = editorDocument()->infoBar();
QString text;
if (line < 0)
text = tr("Could not parse file: '%1'").arg(errorMessage);
text = tr("Could not parse file: '%1'.").arg(errorMessage);
else
text = tr("%2: Could not parse file: '%1'").arg(errorMessage).arg(line);
text = tr("%2: Could not parse file: '%1'.").arg(errorMessage).arg(line);
Core::InfoBarEntry infoBarEntry(infoBarId, text);
infoBarEntry.setCustomButtonInfo(tr("Goto error"), this, SLOT(gotoError()));
infoBar->removeInfo(infoBarId);
......
......@@ -83,7 +83,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
QGridLayout *layout = new QGridLayout(mainWidget);
layout->setMargin(0);
QLabel *label = new QLabel;
label->setText(tr("Creator needs additional settings to enable Android support."
label->setText(tr("Qt Creator needs additional settings to enable Android support."
"You can configure those settings in the Options dialog."));
label->setWordWrap(true);
layout->addWidget(label, 0, 0, 1, 2);
......
......@@ -69,7 +69,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const
QFormLayout *fl = new QFormLayout(this);
QLabel *label = new QLabel(this);
label->setWordWrap(true);
label->setText(tr("Select the .pro file for which you want to create a AndroidManifest.xml file"));
label->setText(tr("Select the .pro file for which you want to create an AndroidManifest.xml file."));
fl->addRow(label);
m_comboBox = new QComboBox(this);
......@@ -108,13 +108,13 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
fl->addRow(tr("Android package source directory:"), m_androidPackageSourceDir);
if (androidPackageDir.isEmpty()) {
label->setText(tr("Select the android package source directory. "
"The files in the android package source directory are copied to the builddirectory's "
"android directory and overwrite the default files."));
label->setText(tr("Select the Android package source directory. "
"The files in the Android package source directory are copied to the build directory's "
"Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setPath(QFileInfo(m_wizard->node()->path()).absolutePath().append(QLatin1String("/android")));
} else {
label->setText(tr("The android manifest file will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file."));
label->setText(tr("The Android manifest file will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file."));
m_androidPackageSourceDir->setPath(androidPackageDir);
m_androidPackageSourceDir->setReadOnly(true);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment