From 3db95cd69466a1d5594d1be602e24bf1cc76e969 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Mon, 28 Oct 2019 16:05:17 +0100
Subject: [PATCH] Boot2Qt: Fix UI text

Change-Id: Ibc25722d16691ffb35cedaadba9c7049975d5836
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
---
 .../boot2qt/device-detection/qdbmessagetracker.cpp   |  2 +-
 src/plugins/boot2qt/device-detection/qdbwatcher.cpp  |  6 +++---
 src/plugins/boot2qt/qdbdevice.cpp                    | 12 ++++++------
 src/plugins/boot2qt/qdbmakedefaultappservice.cpp     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/plugins/boot2qt/device-detection/qdbmessagetracker.cpp b/src/plugins/boot2qt/device-detection/qdbmessagetracker.cpp
index 3e9bc558d0c..8d623b66804 100644
--- a/src/plugins/boot2qt/device-detection/qdbmessagetracker.cpp
+++ b/src/plugins/boot2qt/device-detection/qdbmessagetracker.cpp
@@ -80,7 +80,7 @@ void QdbMessageTracker::handleWatchMessage(const QJsonDocument &document)
         }
 
         m_messageCache.append(message);
-        showMessage(tr("Qdb message: %1").arg(message), true);
+        showMessage(tr("QDB message: %1").arg(message), true);
     }
 }
 
diff --git a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
index e5a9b5c2ef5..ee2b091fd35 100644
--- a/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
+++ b/src/plugins/boot2qt/device-detection/qdbwatcher.cpp
@@ -109,7 +109,7 @@ void QdbWatcher::handleWatchError(QLocalSocket::LocalSocketError error)
 
     if (m_retried) {
         stop();
-        emit watcherError(tr("Could not connect to QDB host server even after trying to start it"));
+        emit watcherError(tr("Could not connect to QDB host server even after trying to start it."));
         return;
     }
     retry();
@@ -142,7 +142,7 @@ void QdbWatcher::forkHostServer()
         return;
     }
     if (QProcess::startDetached(qdbFilePath.toString(), {"server"}))
-        showMessage(tr("QDB host server started"), false);
+        showMessage(tr("QDB host server started."), false);
     else
         showMessage(tr("Could not start QDB host server in %1").arg(qdbFilePath.toString()), true);
 }
@@ -153,7 +153,7 @@ void QdbWatcher::retry()
     {
         QMutexLocker lock(&s_startMutex);
         if (!s_startedServer) {
-            showMessage(tr("Starting QDB host server"), false);
+            showMessage(tr("Starting QDB host server."), false);
             forkHostServer();
             s_startedServer = true;
         }
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index c6e388878d6..e8b8186b505 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -93,7 +93,7 @@ public:
         Runnable r;
         r.setCommandLine(command);
         m_appRunner.start(r, device);
-        showMessage(QdbDevice::tr("Starting command '%1' on device '%2'.")
+        showMessage(QdbDevice::tr("Starting command \"%1\" on device \"%2\".")
                     .arg(command.toUserOutput(), m_deviceName));
     }
 
@@ -112,18 +112,18 @@ private:
         if (!success) {
             QString errorString;
             if (!m_error.isEmpty()) {
-                errorString = QdbDevice::tr("Command failed on device '%1': %2")
+                errorString = QdbDevice::tr("Command failed on device \"%1\": %2")
                         .arg(m_deviceName, m_error);
             } else {
-                errorString = QdbDevice::tr("Command failed on device '%1'.").arg(m_deviceName);
+                errorString = QdbDevice::tr("Command failed on device \"%1\".").arg(m_deviceName);
             }
             showMessage(errorString, true);
             if (!m_stdout.isEmpty())
-                showMessage(QdbDevice::tr("stdout was: '%1'").arg(m_stdout));
+                showMessage(QdbDevice::tr("stdout was: \"%1\"").arg(m_stdout));
             if (!m_stderr.isEmpty())
-                showMessage(QdbDevice::tr("stderr was: '%1'").arg(m_stderr));
+                showMessage(QdbDevice::tr("stderr was: \"%1\"").arg(m_stderr));
         } else {
-            showMessage(QdbDevice::tr("Commands on device '%1' finished successfully.")
+            showMessage(QdbDevice::tr("Commands on device \"%1\" finished successfully.")
                         .arg(m_deviceName));
         }
         deleteLater();
diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
index fc7212b9104..9512ac8f7d1 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
@@ -77,7 +77,7 @@ void QdbMakeDefaultAppService::handleProcessFinished(const QString &error)
     QByteArray processOutput = d->processRunner->readAllStandardOutput();
 
     if (d->makeDefault)
-        emit progressMessage(tr("Application made as the default one."));
+        emit progressMessage(tr("Application set as the default one."));
     else
         emit progressMessage(tr("Reset the default application."));