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

Android: Remove trailing white spaces from translated strings

Browse Source 
Change-Id: Ie88b3bcd8f5e5c04bcd639924c278871245fad70
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Robert Loehning
2020-08-10 19:51:03 +02:00
parent d4332534de
commit a53cd311e5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -712,9 +712,13 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
connect(openSslProgressDialog, &QProgressDialog::canceled, gitCloner, &QtcProcess::kill);
auto failDialog = [=](const QString &msgSuffix = {}) {
QStringList sl;
sl << tr("OpenSSL prebuilt libraries cloning failed.");
if (!msgSuffix.isEmpty())
sl << msgSuffix;
sl << tr("Opening OpenSSL URL for manual download.");
QMessageBox msgBox;
msgBox.setText(tr("OpenSSL prebuilt libraries cloning failed. ") + msgSuffix
+ tr("Opening OpenSSL URL for manual download."));
msgBox.setText(sl.join(" "));
msgBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
QAbstractButton *openButton = msgBox.addButton(tr("Open Download URL"), QMessageBox::ActionRole);
msgBox.exec();
@@ -740,7 +744,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
connect(gitCloner, &QtcProcess::errorOccurred, this, [=](QProcess::ProcessError error) {
openSslProgressDialog->close();
if (error == QProcess::FailedToStart) {
failDialog(tr("The Git tool might not be installed properly on your system. "));
failDialog(tr("The Git tool might not be installed properly on your system."));
} else {
failDialog();
}