summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-06-17 14:01:21 +0200
committerKai Koehne <kai.koehne@digia.com>2013-06-20 12:36:03 +0200
commitb38573f2da0d7de7f9e7abad3e03b666d65ac341 (patch)
treef239430c38dbf947765515af687e2b66c1b12c60 /tools
parent3f0053f9be260f62db054724db1bf4db315913da (diff)
Do not use don't, can't ... in output
Don't, Can't, etc abbreviations are used in informal speech. This is okay in code comments etc, but user output should use the correct, non-abbreviated terms. Change-Id: I53c0dfa91596c151bfa7ef7b65f57d5084ceccde Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/binarycreator/binarycreator.cpp2
-rw-r--r--tools/common/repositorygen.cpp6
-rw-r--r--tools/extractbinarydata/main.cpp2
-rw-r--r--tools/getrepositorycontent/main.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 909a6af81..c43f0a9c7 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -458,7 +458,7 @@ static void printUsage()
std::cout << " -c|--config file The file containing the installer configuration" << std::endl;
- std::cout << " -n|--online-only Don't add any package into the installer" << std::endl;
+ std::cout << " -n|--online-only Do not add any package into the installer" << std::endl;
std::cout << " (for online only installers)" << std::endl;
std::cout << " -f|--offline-only Forces the installer to act as an offline installer, " << std::endl;
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 3c12187db..1001c0a50 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -68,7 +68,7 @@ void QInstallerTools::printRepositoryGenOptions()
std::cout << " -i|--include p1,...,pn Include the given packages and their dependencies" << std::endl;
std::cout << " from the repository." << std::endl;
- std::cout << " --ignore-translations Don't use any translation" << std::endl;
+ std::cout << " --ignore-translations Do not use any translation" << std::endl;
std::cout << " --ignore-invalid-packages Ignore all invalid packages instead of aborting." << std::endl;
}
@@ -120,7 +120,7 @@ static QStringList copyFilesFromNode(const QString &parentNode, const QString &c
const QString filter = attr.isEmpty() ? node.toElement().text() : node.toElement().attribute(attr);
const QStringList files = dir.entryList(QStringList(filter), QDir::Files);
if (files.isEmpty()) {
- throw QInstaller::Error(QString::fromLatin1("Couldn't find any %1 matching '%2' "
+ throw QInstaller::Error(QString::fromLatin1("Could not find any %1 matching '%2' "
"while copying %1 of '%3'.").arg(kind, filter, info.name));
}
@@ -388,7 +388,7 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packa
if (it->fileName().contains(QLatin1Char('-'))) {
if (ignoreInvalidPackages)
continue;
- throw QInstaller::Error(QString::fromLatin1("Component '%1' mustn't contain '-'. This is not "
+ throw QInstaller::Error(QString::fromLatin1("Component '%1' must not contain '-'. This is not "
"allowed, because dashes are used as the separator between the component name and the "
"version number internally.").arg(it->fileName()));
}
diff --git a/tools/extractbinarydata/main.cpp b/tools/extractbinarydata/main.cpp
index a87f3a222..de7acd9af 100644
--- a/tools/extractbinarydata/main.cpp
+++ b/tools/extractbinarydata/main.cpp
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
file.setPermissions(file.permissions() | QFile::WriteUser | QFile::ReadGroup
| QFile::ReadOther);
if (!file.commit(KDSaveFile::OverwriteExistingFile)) {
- throw Error(QString::fromLatin1("Couldn't write binary data to %1. Reason: %2").arg(file
+ throw Error(QString::fromLatin1("Could not write binary data to %1. Reason: %2").arg(file
.fileName(), file.errorString()));
}
file.close();
diff --git a/tools/getrepositorycontent/main.cpp b/tools/getrepositorycontent/main.cpp
index 66a2ec43f..c84826359 100644
--- a/tools/getrepositorycontent/main.cpp
+++ b/tools/getrepositorycontent/main.cpp
@@ -221,7 +221,7 @@ QHash<QString, ComponentData> downLoadRepository(const QString &repositoryUrl, c
itComponentData.next();
QString componentDirectory = QDir(repositoryTarget).filePath(itComponentData.key());
if (!QDir().mkpath(componentDirectory))
- qWarning() << "couldn't create:" << componentDirectory;
+ qWarning() << "could not create:" << componentDirectory;
foreach (const QString &download, itComponentData.value().m_downloadDownloadableArchives) {
const QString fileTarget(componentDirectory + QDir::separator() + download);
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
QDir().mkpath(pathToTarget);
QFile file;
if (!file.copy(absoluteSourceFilePath, target)) {
- qWarning() << QString::fromLatin1("copy file %1 to %2 wasn't working %3").arg(
+ qWarning() << QString::fromLatin1("copy file %1 to %2 was not working %3").arg(
absoluteSourceFilePath, target, file.errorString());
}
}