diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-24 10:15:16 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-24 09:22:42 +0000 |
commit | 1e589e37a991b29076e9a661f92dfa178421c208 (patch) | |
tree | ccdae70edb75b1bc17f0efc61086e16554e3f4eb /src/libs/installer/consumeoutputoperation.cpp | |
parent | 65a5d4d33c7dcb27ce99ce59535733a28991c544 (diff) |
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>
Diffstat (limited to 'src/libs/installer/consumeoutputoperation.cpp')
-rw-r--r-- | src/libs/installer/consumeoutputoperation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp index bf9e6c143..f665a4c44 100644 --- a/src/libs/installer/consumeoutputoperation.cpp +++ b/src/libs/installer/consumeoutputoperation.cpp @@ -74,8 +74,8 @@ bool ConsumeOutputOperation::performOperation() const QString installerKeyName = arguments().at(0); if (installerKeyName.isEmpty()) { setError(UserDefinedError); - setErrorString(tr("Can not save the output of %1 to an empty installer key value.").arg( - arguments().at(1))); + setErrorString(tr("Cannot save the output of \"%1\" to an empty installer key value.").arg( + QDir::toNativeSeparators(arguments().at(1)))); return false; } @@ -88,7 +88,7 @@ bool ConsumeOutputOperation::performOperation() if (!executable.exists() || !executable.isExecutable()) { setError(UserDefinedError); - setErrorString(tr("File '%1' does not exist or is not an executable binary.").arg( + setErrorString(tr("File \"%1\" does not exist or is not an executable binary.").arg( QDir::toNativeSeparators(executable.absoluteFilePath()))); return false; } @@ -109,7 +109,7 @@ bool ConsumeOutputOperation::performOperation() << "standard output: " << process.readAllStandardOutput() << "error output: " << process.readAllStandardError(); setError(UserDefinedError); - setErrorString(tr("Running '%1' resulted in a crash.").arg( + setErrorString(tr("Running \"%1\" resulted in a crash.").arg( QDir::toNativeSeparators(executable.absoluteFilePath()))); return false; } @@ -127,7 +127,7 @@ bool ConsumeOutputOperation::performOperation() } if (executableOutput.isEmpty()) { - qWarning() << QString::fromLatin1("Cannot get any query output from executable: '%1'").arg( + qWarning() << QString::fromLatin1("Cannot get any query output from executable \"%1\".").arg( executable.absoluteFilePath()); } core->setValue(installerKeyName, QString::fromLocal8Bit(executableOutput)); |