Merge remote-tracking branch 'origin/2.0' into 3.0

Conflicts:
	src/libs/installer/downloadfiletask.cpp
	src/sdk/translations/ru.ts

Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp
index c6cef2183..2c99e04e1 100644
--- a/src/libs/installer/downloadfiletask.cpp
+++ b/src/libs/installer/downloadfiletask.cpp
@@ -257,6 +257,7 @@ void Downloader::onError(QNetworkReply::NetworkError error)
         const Data &data = *m_downloads[reply];
         //Do not throw error if Updates.xml not found. The repository might be removed
         //with RepositoryUpdate in Updates.xml later.
+        //: %2 is a sentence describing the error
         if (data.taskItem.source().contains(QLatin1String("Updates.xml"), Qt::CaseInsensitive)) {
             qDebug() << QString::fromLatin1("Network error while downloading '%1': %2.").arg(
                    data.taskItem.source(), reply->errorString());
@@ -265,7 +266,6 @@ void Downloader::onError(QNetworkReply::NetworkError error)
                 TaskException(tr("Network error while downloading '%1': %2.").arg(
                                       data.taskItem.source(), reply->errorString())));
         }
-        //: %2 is a sentence describing the error
     } else {
         //: %1 is a sentence describing the error
         m_futureInterface->reportException(