Unify translated error messages

* Enclose file paths in ""
* Localize file paths with QDir::toNativeSeparators.
* Make sure sentences end with a '.'
* Append error details always by ':', e.g.
    tr("Failed to copy file '%1': %2").(...)
* Use 'directory' instead of 'folder' everywhere

Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

1 files changed, 24 insertions, 18 deletions

diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index a44db1126..00c289ffa 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -182,7 +182,8 @@ void QInstaller::removeFiles(const QString &path, bool ignoreErrors)
             QFile f(fi.filePath());
             if (!f.remove()) {
                 const QString errorMessage = QCoreApplication::translate("QInstaller",
-                    "Could not remove file %1: %2").arg(f.fileName(), f.errorString());
+                    "Cannot remove file \"%1\": %2").arg(
+                            QDir::toNativeSeparators(f.fileName()), f.errorString());
                 if (!ignoreErrors)
                     throw Error(errorMessage);
                 qWarning() << errorMessage;
@@ -223,7 +224,8 @@ void QInstaller::removeDirectory(const QString &path, bool ignoreErrors)
         errno = 0;
         if (d.exists(path) && !d.rmdir(dir)) {
             const QString errorMessage = QCoreApplication::translate("QInstaller",
-                "Could not remove folder %1: %2").arg(dir, errnoToQString(errno));
+                "Cannot remove directory \"%1\": %2").arg(QDir::toNativeSeparators(dir),
+                                                          errnoToQString(errno));
             if (!ignoreErrors)
                 throw Error(errorMessage);
             qWarning() << errorMessage;
@@ -293,8 +295,8 @@ void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString &
     Q_ASSERT(QFileInfo(sourceDir).isDir());
     Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir());
     if (!QDir().mkpath(targetDir)) {
-        throw Error(QCoreApplication::translate("QInstaller", "Could not create folder %1")
-            .arg(targetDir));
+        throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\".")
+            .arg(QDir::toNativeSeparators(targetDir)));
     }
     QDirIterator it(sourceDir, QDir::NoDotAndDotDot | QDir::AllEntries);
     while (it.hasNext()) {
@@ -307,8 +309,10 @@ void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString &
             const QString target = QDir(targetDir).absoluteFilePath(i.fileName());
             if (!f.copy(target)) {
                 throw Error(QCoreApplication::translate("QInstaller",
-                    "Could not copy file from %1 to %2: %3").arg(f.fileName(), target,
-                    f.errorString()));
+                    "Cannot copy file from \"%1\" to \"%2\": %3").arg(
+                                QDir::toNativeSeparators(f.fileName()),
+                                QDir::toNativeSeparators(target),
+                                f.errorString()));
             }
         }
     }
@@ -319,8 +323,8 @@ void QInstaller::moveDirectoryContents(const QString &sourceDir, const QString &
     Q_ASSERT(QFileInfo(sourceDir).isDir());
     Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir());
     if (!QDir().mkpath(targetDir)) {
-        throw Error(QCoreApplication::translate("QInstaller", "Could not create folder %1")
-            .arg(targetDir));
+        throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\".")
+            .arg(QDir::toNativeSeparators(targetDir)));
     }
     QDirIterator it(sourceDir, QDir::NoDotAndDotDot | QDir::AllEntries);
     while (it.hasNext()) {
@@ -336,8 +340,10 @@ void QInstaller::moveDirectoryContents(const QString &sourceDir, const QString &
             const QString target = QDir(targetDir).absoluteFilePath(i.fileName());
             if (!f.rename(target)) {
                 throw Error(QCoreApplication::translate("QInstaller",
-                    "Could not move file from %1 to %2: %3").arg(f.fileName(), target,
-                    f.errorString()));
+                    "Cannot move file from \"%1\" to \"%2\": %3").arg(
+                                QDir::toNativeSeparators(f.fileName()),
+                                QDir::toNativeSeparators(target),
+                                f.errorString()));
             }
         }
     }
@@ -347,8 +353,8 @@ void QInstaller::mkdir(const QString &path)
 {
     errno = 0;
     if (!QDir().mkdir(QFileInfo(path).absoluteFilePath())) {
-        throw Error(QCoreApplication::translate("QInstaller", "Could not create folder %1: %2")
-            .arg(path, errnoToQString(errno)));
+        throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\": %2")
+            .arg(QDir::toNativeSeparators(path), errnoToQString(errno)));
     }
 }
 
@@ -356,8 +362,8 @@ void QInstaller::mkpath(const QString &path)
 {
     errno = 0;
     if (!QDir().mkpath(QFileInfo(path).absoluteFilePath())) {
-        throw Error(QCoreApplication::translate("QInstaller", "Could not create folder %1: %2")
-            .arg(path, errnoToQString(errno)));
+        throw Error(QCoreApplication::translate("QInstaller", "Cannot create directory \"%1\": %2")
+            .arg(QDir::toNativeSeparators(path), errnoToQString(errno)));
     }
 }
 
@@ -367,7 +373,7 @@ QString QInstaller::generateTemporaryFileName(const QString &templ)
         QTemporaryFile f;
         if (!f.open()) {
             throw Error(QCoreApplication::translate("QInstaller",
-                "Could not open temporary file: %1").arg(f.errorString()));
+                "Cannot open temporary file: %1").arg(f.errorString()));
         }
         return f.fileName();
     }
@@ -386,7 +392,7 @@ QString QInstaller::generateTemporaryFileName(const QString &templ)
     QFile f(tmp.arg(templ, suffix).arg(count));
     if (!f.open(QIODevice::WriteOnly)) {
         throw Error(QCoreApplication::translate("QInstaller",
-            "Could not open temporary file for template %1: %2").arg(templ, f.errorString()));
+            "Cannot open temporary file for template %1: %2").arg(templ, f.errorString()));
     }
     f.remove();
     return f.fileName();
@@ -487,13 +493,13 @@ void QInstaller::setApplicationIcon(const QString &application, const QString &i
 {
     QFile iconFile(icon);
     if (!iconFile.open(QIODevice::ReadOnly)) {
-        qWarning() << QString::fromLatin1("Could not use '%1' as application icon: %2.")
+        qWarning() << QString::fromLatin1("Cannot use \"%1\" as application icon: %2")
             .arg(icon, iconFile.errorString());
         return;
     }
 
     if (QImageReader::imageFormat(icon) != "ico") {
-        qWarning() << QString::fromLatin1("Could not use '%1' as application icon, unsupported format %2.")
+        qWarning() << QString::fromLatin1("Cannot use \"%1\" as application icon, unsupported format %2.")
             .arg(icon, QLatin1String(QImageReader::imageFormat(icon)));
         return;
     }