Commit fa9dbd3b authored by Leena Miettinen's avatar Leena Miettinen

Android: check UI text for style and grammar

Change-Id: I8b808cf374fcdc124c5b2b7d9a113e6d64b17f2f
Reviewed-by: default avatarBogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
parent 68f2d228
......@@ -438,7 +438,7 @@ bool AndroidConfigurations::createAVD(int minApiLevel) const
avdDialog.targetComboBox->setModel(&model);
if (!model.rowCount()) {
QMessageBox::critical(0, tr("Error Creating AVD"),
tr("Cannot create a new AVD, no sufficiently recent Android SDK available.\n"
tr("Cannot create a new AVD. No sufficiently recent Android SDK available.\n"
"Please install an SDK of at least API version %1.").
arg(minApiLevel));
return false;
......
......@@ -248,7 +248,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>City or Locality:</string>
<string>City or locality:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......@@ -261,7 +261,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>State or Province:</string>
<string>State or province:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
......@@ -255,7 +255,7 @@ bool AndroidDeployStep::deployPackage()
QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt"));
writeOutput(tr("Deploy Qt libraries ... this may take some time, please wait"));
writeOutput(tr("Deploy Qt libraries. This may take some time, please wait."));
const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName;
AndroidPackageCreationStep::removeDirectory(tempPath);
QStringList stripFiles;
......@@ -299,13 +299,13 @@ bool AndroidDeployStep::deployPackage()
if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) {
raiseError(tr("Package installation failed"));
raiseError(tr("Package installation failed."));
disconnect(deployProc, 0, this, 0);
deployProc->deleteLater();
return false;
}
writeOutput(tr("Pulling files necessary for debugging"));
writeOutput(tr("Pulling files necessary for debugging."));
runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(),
QStringList() << QLatin1String("-s") << m_deviceSerialNumber
<< QLatin1String("pull") << QLatin1String("/system/bin/app_process")
......
......@@ -65,7 +65,7 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa
QString AndroidDeployStepFactory::displayNameForId(const Core::Id id) const
{
if (id == AndroidDeployStep::Id)
return tr("Deploy to Android device/emulator");
return tr("Deploy to Android device or emulator");
return QString();
}
......
......@@ -59,7 +59,7 @@ You must have Qt libraries compiled for that platform</string>
<item>
<widget class="QPushButton" name="editRulesFilePushButton">
<property name="text">
<string>Edit rules file</string>
<string>Edit Rules File</string>
</property>
</widget>
</item>
......@@ -74,7 +74,7 @@ You must have Qt libraries compiled for that platform</string>
This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator).</string>
</property>
<property name="text">
<string>Install Ministro system wide Qt shared libraries installer</string>
<string>Install Ministro, system-wide Qt shared libraries installer</string>
</property>
</widget>
</item>
......@@ -84,7 +84,7 @@ This option is useful when you want to try your application on devices which don
<bool>false</bool>
</property>
<property name="text">
<string>Choose apk</string>
<string>Choose APK</string>
</property>
</widget>
</item>
......
......@@ -402,7 +402,7 @@ void AndroidPackageCreationWidget::prebundledLibMoveDown()
void AndroidPackageCreationWidget::setHDPIIcon()
{
QString file = QFileDialog::getOpenFileName(this, tr("Choose High DPI Icon"), QDir::homePath(), tr("png images (*.png)"));
QString file = QFileDialog::getOpenFileName(this, tr("Choose High DPI Icon"), QDir::homePath(), tr("PNG images (*.png)"));
if (!file.length())
return;
AndroidManager::setHighDpiIcon(m_step->target(), file);
......@@ -411,7 +411,7 @@ void AndroidPackageCreationWidget::setHDPIIcon()
void AndroidPackageCreationWidget::setMDPIIcon()
{
QString file = QFileDialog::getOpenFileName(this, tr("Choose Medium DPI Icon"), QDir::homePath(), tr("png images (*.png)"));
QString file = QFileDialog::getOpenFileName(this, tr("Choose Medium DPI Icon"), QDir::homePath(), tr("PNG images (*.png)"));
if (!file.length())
return;
AndroidManager::setMediumDpiIcon(m_step->target(), file);
......@@ -420,7 +420,7 @@ void AndroidPackageCreationWidget::setMDPIIcon()
void AndroidPackageCreationWidget::setLDPIIcon()
{
QString file = QFileDialog::getOpenFileName(this, tr("Choose Low DPI Icon"), QDir::homePath(), tr("png images (*.png)"));
QString file = QFileDialog::getOpenFileName(this, tr("Choose Low DPI Icon"), QDir::homePath(), tr("PNG images (*.png)"));
if (!file.length())
return;
AndroidManager::setLowDpiIcon(m_step->target(), file);
......@@ -437,8 +437,8 @@ void AndroidPackageCreationWidget::permissionActivated(QModelIndex index)
void AndroidPackageCreationWidget::addPermission()
{
setEnabledSaveDiscardButtons(true);
m_ui->permissionsListView->setCurrentIndex(m_permissionsModel->addPermission(tr("< type or choose a permission >")));
m_ui->permissionsComboBox->lineEdit()->setText(tr("< type or choose a permission >"));
m_ui->permissionsListView->setCurrentIndex(m_permissionsModel->addPermission(tr("< Type or choose a permission >")));
m_ui->permissionsComboBox->lineEdit()->setText(tr("< Type or choose a permission >"));
m_ui->permissionsComboBox->setFocus();
m_ui->removePermissionButton->setEnabled(m_permissionsModel->permissions().size());
}
......
......@@ -69,7 +69,7 @@ QString AndroidQtVersion::invalidReason() const
{
QString tmp = BaseQtVersion::invalidReason();
if (tmp.isEmpty() && qtAbis().isEmpty())
return tr("Failed to detect the ABI(s) used by the Qt version.");
return tr("Failed to detect the ABIs used by the Qt version.");
return tmp;
}
......
......@@ -66,7 +66,7 @@ void AndroidRunControl::start()
SLOT(handleRemoteOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(QString)));
appendMessage(tr("Starting remote process..."), Utils::NormalMessageFormat);
appendMessage(tr("Starting remote process."), Utils::NormalMessageFormat);
m_runner->start();
}
......
......@@ -184,7 +184,7 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
QString AndroidRunControlFactory::displayName() const
{
return tr("Run on Android device/emulator");
return tr("Run on Android device or emulator.");
}
} // namespace Internal
......
......@@ -96,7 +96,7 @@ void AndroidRunner::checkPID()
if (-1 != m_processPID && pid == -1) {
m_processPID = -1;
emit remoteProcessFinished(tr("\n\n'%1' died").arg(m_packageName));
emit remoteProcessFinished(tr("\n\n'%1' died.").arg(m_packageName));
return;
}
m_processPID = pid;
......@@ -151,11 +151,11 @@ void AndroidRunner::asyncStart()
<< QString::fromLatin1("localfilesystem:/data/data/%1/debug-socket").arg(m_packageName);
adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
if (!adbStarProc.waitForStarted()) {
emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1").arg(adbStarProc.errorString()));
emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1.").arg(adbStarProc.errorString()));
return;
}
if (!adbStarProc.waitForFinished(-1)) {
emit remoteProcessFinished(tr("Failed to forward C++ debugging ports"));
emit remoteProcessFinished(tr("Failed to forward C++ debugging ports."));
return;
}
extraParams = QLatin1String("-e native_debug true -e gdbserver_socket +debug-socket");
......@@ -167,11 +167,11 @@ void AndroidRunner::asyncStart()
<< QLatin1String("forward") << port << port; // currently forward to same port on device and host
adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
if (!adbStarProc.waitForStarted()) {
emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1").arg(adbStarProc.errorString()));
emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1.").arg(adbStarProc.errorString()));
return;
}
if (!adbStarProc.waitForFinished(-1)) {
emit remoteProcessFinished(tr("Failed to forward QML debugging ports"));
emit remoteProcessFinished(tr("Failed to forward QML debugging ports."));
return;
}
extraParams+=QString::fromLatin1(" -e qml_debug true -e qmljsdebugger port:%1")
......@@ -196,12 +196,12 @@ void AndroidRunner::asyncStart()
adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
if (!adbStarProc.waitForStarted()) {
emit remoteProcessFinished(tr("Failed to start the activity. Reason: %1").arg(adbStarProc.errorString()));
emit remoteProcessFinished(tr("Failed to start the activity. Reason: %1.").arg(adbStarProc.errorString()));
return;
}
if (!adbStarProc.waitForFinished(-1)) {
adbStarProc.terminate();
emit remoteProcessFinished(tr("Unable to start '%1'").arg(m_packageName));
emit remoteProcessFinished(tr("Unable to start '%1'.").arg(m_packageName));
return;
}
QTime startTime = QTime::currentTime();
......@@ -209,7 +209,7 @@ void AndroidRunner::asyncStart()
checkPID();
}
if (m_processPID == -1) {
emit remoteProcessFinished(tr("Cannot find %1 process").arg(m_packageName));
emit remoteProcessFinished(tr("Cannot find %1 process.").arg(m_packageName));
return;
}
......@@ -246,7 +246,7 @@ void AndroidRunner::stop()
void AndroidRunner::asyncStop()
{
killPID();
emit remoteProcessFinished(tr("\n\n'%1' killed").arg(m_packageName));
emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName));
}
void AndroidRunner::logcatReadStandardError()
......
......@@ -192,7 +192,7 @@ bool AndroidSettingsWidget::checkSDK(const Utils::FileName &location)
|| (!androidExe.appendPath(QLatin1String("/tools/android" ANDROID_EXE_SUFFIX)).toFileInfo().exists()
&& !androidBat.appendPath(QLatin1String("/tools/android" ANDROID_BAT_SUFFIX)).toFileInfo().exists())
|| !emulator.appendPath(QLatin1String("/tools/emulator" ANDROID_EXE_SUFFIX)).toFileInfo().exists()) {
QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" doesn't seem to be an Android SDK top folder").arg(location.toUserOutput()));
QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" does not seem to be an Android SDK top folder.").arg(location.toUserOutput()));
return false;
}
return true;
......@@ -213,7 +213,7 @@ bool AndroidSettingsWidget::checkNDK(const Utils::FileName &location)
if (!platformPath.appendPath(QLatin1String("platforms")).toFileInfo().exists()
|| !toolChainPath.appendPath(QLatin1String("toolchains")).toFileInfo().exists()
|| !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).toFileInfo().exists()) {
QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" doesn't seem to be an Android NDK top folder").arg(location.toUserOutput()));
QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" does not seem to be an Android NDK top folder.").arg(location.toUserOutput()));
return false;
}
m_androidConfig.ndkLocation = location;
......
......@@ -59,7 +59,7 @@
<item row="2" column="0">
<widget class="QLabel" name="NDKToolchainVersionLabel">
<property name="text">
<string>Android NDK toolchain version:</string>
<string>Android NDK tool chain version:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......@@ -92,7 +92,7 @@
<item row="4" column="0">
<widget class="QLabel" name="GdbLocationLabel">
<property name="text">
<string>arm GDB location:</string>
<string>ARM GDB location:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......@@ -112,7 +112,7 @@
<item row="5" column="0">
<widget class="QLabel" name="GdbserverLocationLabel">
<property name="text">
<string>arm GDBserver location:</string>
<string>ARM GDB server location:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......@@ -152,7 +152,7 @@
<item row="7" column="0">
<widget class="QLabel" name="GdbserverLocationLabelx86">
<property name="text">
<string>x86 GDBserver location:</string>
<string>x86 GDB server location:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
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