feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: rephrase some bad UI text sentences

Browse Source 
Change-Id: If563b0778ceafcaeceb13f697d273c69f484929b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-03-14 17:48:11 +02:00
parent 7be9d0f567
commit e857b02579
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidsettingswidget.cpp
View File

@@ -787,8 +787,8 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
QDir openSslDir(openSslPath.toString()); QDir openSslDir(openSslPath.toString());
if (openSslDir.exists()) { if (openSslDir.exists()) {
auto userInput = QMessageBox::information(this, openSslCloneTitle, auto userInput = QMessageBox::information(this, openSslCloneTitle,
tr("The selected download path (%1) for OpenSSL already exists, " tr("The selected download path (%1) for OpenSSL already exists. "
"do you want to remove and overwrite its content?") "Remove and overwrite its content?")
.arg(QDir::toNativeSeparators(openSslPath.toString())), .arg(QDir::toNativeSeparators(openSslPath.toString())),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);
if (userInput == QMessageBox::Yes) if (userInput == QMessageBox::Yes)
@@ -798,7 +798,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
} }
QProgressDialog *openSslProgressDialog QProgressDialog *openSslProgressDialog
= new QProgressDialog(tr("Cloning OpenSSL prebuilt libraries, please be patient..."), = new QProgressDialog(tr("Cloning OpenSSL prebuilt libraries..."),
tr("Cancel"), 0, 0); tr("Cancel"), 0, 0);
openSslProgressDialog->setWindowModality(Qt::WindowModal); openSslProgressDialog->setWindowModality(Qt::WindowModal);
openSslProgressDialog->setWindowTitle(openSslCloneTitle); openSslProgressDialog->setWindowTitle(openSslCloneTitle);
@@ -820,7 +820,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
(exitStatus == Utils::QtcProcess::NormalExit && exitCode != 0)) { (exitStatus == Utils::QtcProcess::NormalExit && exitCode != 0)) {
QMessageBox::information(this, openSslCloneTitle, QMessageBox::information(this, openSslCloneTitle,
tr("OpenSSL prebuilt libraries cloning failed. " tr("OpenSSL prebuilt libraries cloning failed. "
"Opening OpenSSL URL for manual download...")); "Opening OpenSSL URL for manual download."));
QDesktopServices::openUrl(QUrl::fromUserInput(openSslRepo)); QDesktopServices::openUrl(QUrl::fromUserInput(openSslRepo));
} }
}); });
@@ -933,7 +933,7 @@ void AndroidSettingsWidget::manageAVD()
void AndroidSettingsWidget::downloadSdk() void AndroidSettingsWidget::downloadSdk()
{ {
QString message(tr("Do you want to download and install Android SDK Tools to: %1?") QString message(tr("Download and install Android SDK Tools to: %1?")
.arg(QDir::toNativeSeparators(m_ui->SDKLocationPathChooser->rawPath()))); .arg(QDir::toNativeSeparators(m_ui->SDKLocationPathChooser->rawPath())));
auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(), auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(),
message, QMessageBox::Yes | QMessageBox::No); message, QMessageBox::Yes | QMessageBox::No);

14
src/plugins/android/androidsettingswidget.ui
View File

@@ -51,7 +51,7 @@
<item row="0" column="2"> <item row="0" column="2">
<widget class="QToolButton" name="downloadOpenJDKToolButton"> <widget class="QToolButton" name="downloadOpenJDKToolButton">
<property name="toolTip"> <property name="toolTip">
<string>Download JDK</string> <string>Open JDK download URL in the system's browser.</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -119,14 +119,14 @@
<item row="0" column="6"> <item row="0" column="6">
<widget class="QToolButton" name="downloadSDKToolButton"> <widget class="QToolButton" name="downloadSDKToolButton">
<property name="toolTip"> <property name="toolTip">
<string>Download Android SDK</string> <string>Open Android SDK download URL in the system's browser.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="6"> <item row="2" column="6">
<widget class="QToolButton" name="downloadNDKToolButton"> <widget class="QToolButton" name="downloadNDKToolButton">
<property name="toolTip"> <property name="toolTip">
<string/> <string>Open Android NDK download URL in the system's browser.</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
@@ -246,19 +246,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QToolButton" name="downloadOpenSSLPrebuiltLibs"> <widget class="QToolButton" name="downloadOpenSSLPrebuiltLibs">
<property name="toolTip"> <property name="toolTip">
<string>Automatically download OpenSSL prebuilt libraries. If the automatic download fails, a URL will be opened in the browser for manual download.</string> <string>Automatically download OpenSSL prebuilt libraries. If the automatic download fails, the download URL will be opened in the system's browser for manual download.</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3">
<widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>