From a53cd311e5ca2d803a7597d6e6258e7d223f35da Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 10 Aug 2020 19:51:03 +0200 Subject: [PATCH] Android: Remove trailing white spaces from translated strings Change-Id: Ie88b3bcd8f5e5c04bcd639924c278871245fad70 Reviewed-by: Assam Boudjelthia Reviewed-by: Leena Miettinen --- src/plugins/android/androidsettingswidget.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 440ed329b54..49038bd0a41 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -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(); }