From 5f16074cb3674ab1cf61e568eae8282f7d03fb57 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Sun, 6 Mar 2022 16:39:27 +0200
Subject: [PATCH] Android: rephrase sdk download popup question

Remove the double column, put the path in new line to avoid potential
word wrap at the start, and surround it with quotes.

Change-Id: Ifb33e4efaaa13342bfc3a75fc58d67e359e4e804
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 share/qtcreator/translations/qtcreator_de.ts  | 2 +-
 share/qtcreator/translations/qtcreator_ru.ts  | 2 +-
 src/plugins/android/androidsettingswidget.cpp | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index dece10295e4..8013bb9b20e 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -19692,7 +19692,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <translation>(SDK-Version: %1, NDK-Version: %2)</translation>
     </message>
     <message>
-        <source>Download and install Android SDK Tools to: %1?</source>
+        <source>Download and install Android SDK Tools to %1?</source>
         <translation>Android-SDK-Tools herunterladen und nach %1 installieren?</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 0a7cda15516..ca1e07984e3 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -1967,7 +1967,7 @@ Prefix with : if the process is private, use a lowercase name if the process is
         <translation>Выбранный путь уже содержит корректный пакет инструментов SDK.</translation>
     </message>
     <message>
-        <source>Download and install Android SDK Tools to: %1?</source>
+        <source>Download and install Android SDK Tools to %1?</source>
         <translation>Загрузить и установить инструменты Android SDK в %1?</translation>
     </message>
     <message>
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 58f03d6cb2e..7fe0d09c708 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -682,8 +682,9 @@ void AndroidSettingsWidget::downloadSdk()
         return;
     }
 
-    const QString message = tr("Download and install Android SDK Tools to: %1?")
-                        .arg(m_ui.SDKLocationPathChooser->filePath().cleanPath().toUserOutput());
+    const QString message = tr("Download and install Android SDK Tools to %1?")
+            .arg("\n\"" + m_ui.SDKLocationPathChooser->filePath().cleanPath().toUserOutput()
+                 + "\"");
     auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(),
                                               message, QMessageBox::Yes | QMessageBox::No);
     if (userInput == QMessageBox::Yes)