From 2231d4966430caa4e1c0d56f0b2c6cd2533e7ba4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 31 Jul 2014 14:31:51 +0200 Subject: Avoid contractions in user-visible messages. Change-Id: I68685166bfaa873f1e5995c7d507afef45b03055 Reviewed-by: Joerg Bornemann --- src/app/qbs-setup-toolchains/xcodeprobe.cpp | 2 +- src/lib/corelib/buildgraph/projectbuilddata.cpp | 4 ++-- src/lib/corelib/buildgraph/rulesapplicator.cpp | 4 ++-- src/lib/corelib/language/itemreader.cpp | 2 +- src/lib/corelib/language/itemreaderastvisitor.cpp | 4 ++-- src/lib/corelib/tools/scannerpluginmanager.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index bd7ca97e0..4174f2d5d 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -146,7 +146,7 @@ void XcodeProbe::setArch(Profile *profile, const QString &pathToGcc, const QStri QString compilerTriplet = qsystem(pathToGcc, flags).simplified(); QStringList compilerTripletl = compilerTriplet.split(QLatin1Char('-')); if (compilerTripletl.count() < 2) { - qbsError() << QString::fromLocal8Bit("Detected '%1', but I don't understand " + qbsError() << QString::fromLocal8Bit("Detected '%1', but I do not understand " "its architecture '%2'.") .arg(pathToGcc, compilerTriplet); return; diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 6af68caa3..3f8634b51 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -511,7 +511,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc foreach (const QString &inputFileName, rtrafo->inputs) { Artifact *artifact = lookupArtifact(product, inputFileName); if (Q_UNLIKELY(!artifact)) - throw ErrorInfo(Tr::tr("Can't find artifact '%0' in the list of source files.") + throw ErrorInfo(Tr::tr("Cannot find artifact '%0' in the list of source files.") .arg(inputFileName)); inputArtifacts += artifact; } @@ -553,7 +553,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc ScriptEngine::argumentList(transformer->rule->prepareScript->argumentNames, prepareScriptContext)); if (Q_UNLIKELY(transformer->commands.isEmpty())) - throw ErrorInfo(Tr::tr("There's a transformer without commands."), + throw ErrorInfo(Tr::tr("There is a transformer without commands."), rtrafo->transform->location); } diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 8151cdc52..4986a517b 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -236,7 +236,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p m_transformer->createCommands(m_rule->prepareScript, evalContext(), ScriptEngine::argumentList(m_rule->prepareScript->argumentNames, prepareScriptContext)); if (Q_UNLIKELY(m_transformer->commands.isEmpty())) - throw ErrorInfo(Tr::tr("There's a rule without commands: %1.") + throw ErrorInfo(Tr::tr("There is a rule without commands: %1.") .arg(m_rule->toString()), m_rule->prepareScript->location); } @@ -438,7 +438,7 @@ public: const QStringList &nameParts = nvp.first; const QVariant &value = nvp.second; if (!artifactModulesCfg.contains(nameParts.first())) { - throw ErrorInfo(Tr::tr("Can't set module property %1 on artifact %2.") + throw ErrorInfo(Tr::tr("Cannot set module property %1 on artifact %2.") .arg(nameParts.join(QLatin1String(".")), outputArtifact->filePath())); } diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp index 911c49fdf..18d491b73 100644 --- a/src/lib/corelib/language/itemreader.cpp +++ b/src/lib/corelib/language/itemreader.cpp @@ -161,7 +161,7 @@ ItemReaderResult ItemReader::internalReadFile(const QString &filePath) } else { QFile file(filePath); if (Q_UNLIKELY(!file.open(QFile::ReadOnly))) - throw ErrorInfo(Tr::tr("Couldn't open '%1'.").arg(filePath)); + throw ErrorInfo(Tr::tr("Cannot open '%1'.").arg(filePath)); m_filesRead.insert(filePath); const QString code = QTextStream(&file).readAll(); diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp index 690a944db..4cddd0dc0 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.cpp +++ b/src/lib/corelib/language/itemreaderastvisitor.cpp @@ -193,7 +193,7 @@ bool ItemReaderASTVisitor::visit(AST::UiImportList *uiImportList) } if (Q_UNLIKELY(importAsNames.contains(as))) { - throw ErrorInfo(Tr::tr("Can't import into the same name more than once."), + throw ErrorInfo(Tr::tr("Cannot import into the same name more than once."), toCodeLocation(import->importIdToken)); } if (Q_UNLIKELY(JsExtensions::hasExtension(as))) { @@ -208,7 +208,7 @@ bool ItemReaderASTVisitor::visit(AST::UiImportList *uiImportList) QFileInfo fi(filePath); if (Q_UNLIKELY(!fi.exists())) - throw ErrorInfo(Tr::tr("Can't find imported file %0.").arg(filePath), + throw ErrorInfo(Tr::tr("Cannot find imported file %0.").arg(filePath), CodeLocation(m_file->filePath(), import->fileNameToken.startLine, import->fileNameToken.startColumn)); filePath = fi.canonicalFilePath(); diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp index e795da159..8bf43d2bd 100644 --- a/src/lib/corelib/tools/scannerpluginmanager.cpp +++ b/src/lib/corelib/tools/scannerpluginmanager.cpp @@ -82,14 +82,14 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log const QString fileName = it.next(); QScopedPointer lib(new QLibrary(fileName)); if (!lib->load()) { - logger.qbsWarning() << Tr::tr("pluginmanager: couldn't load plugin '%1': %2") + logger.qbsWarning() << Tr::tr("Pluginmanager: Cannot load plugin '%1': %2") .arg(QDir::toNativeSeparators(fileName), lib->errorString()); continue; } getScanners_f getScanners = reinterpret_cast(lib->resolve("getScanners")); if (!getScanners) { - logger.qbsWarning() << Tr::tr("pluginmanager: couldn't resolve " + logger.qbsWarning() << Tr::tr("Pluginmanager: Cannot resolve " "symbol in '%1'.").arg(QDir::toNativeSeparators(fileName)); continue; } -- cgit v1.2.3