Tr: Move some line endings at beginning and end out of tr

Change-Id: Ibb0aba4d6e58bfe4684a818a894876c1f8f7df15
Reviewed-by: <[email protected]>
Reviewed-by: Jarek Kobus <[email protected]>

2 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index ca0be7770c4..b0da90123e8 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -438,7 +438,7 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
 
     if (result.stdError.isEmpty() && !result.success)
         result.stdError = Tr::tr("Failed.");
-    result.stdOutput = Tr::tr("Done\n\n");
+    result.stdOutput = Tr::tr("Done") + "\n\n";
     promise.addResult(result);
     promise.setProgressValue(100);
 }
@@ -468,8 +468,8 @@ void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const QStringList &inst
         currentProgress += progressQuota;
         fi.setProgressValue(currentProgress);
         if (result.stdError.isEmpty() && !result.success)
-            result.stdError = Tr::tr("AndroidSdkManager", "Failed");
-        result.stdOutput = Tr::tr("AndroidSdkManager", "Done\n\n");
+            result.stdError = Tr::tr("Failed");
+        result.stdOutput = Tr::tr("Done") + "\n\n";
         fi.addResult(result);
         return fi.isCanceled();
     };
@@ -569,7 +569,7 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
     m_licenseTextCache.clear();
     result.success = licenseCommand.exitStatus() == QProcess::NormalExit;
     if (!result.success)
-        result.stdError = Tr::tr("License command failed.\n\n");
+        result.stdError = Tr::tr("License command failed.") + "\n\n";
     fi.addResult(result);
     fi.setProgressValue(100);
 }
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index d228cd46024..cd3bbb8532b 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -290,9 +290,10 @@ void AndroidSdkManagerWidget::installEssentials()
 
 void AndroidSdkManagerWidget::beginLicenseCheck()
 {
-    m_formatter->appendMessage(Tr::tr("Checking pending licenses...\n"), NormalMessageFormat);
+    m_formatter->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
     m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
-                                      "respective licenses are not accepted.\n"),
+                                      "respective licenses are not accepted.")
+                                   + "\n",
                                LogMessageFormat);
     addPackageFuture(m_sdkManager->checkPendingLicenses());
 }
@@ -302,7 +303,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
     QTC_ASSERT(m_currentView == PackageListing, return);
 
     if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat);
+        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
         return;
     }
 
@@ -356,7 +357,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
 void AndroidSdkManagerWidget::onUpdatePackages()
 {
     if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat);
+        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
         return;
     }
     switchView(Operations);