summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2012-02-09 10:31:04 +0100
committerNiels Weber <niels.2.weber@nokia.com>2012-02-09 11:19:35 +0100
commit59c00c76c97fcd6e9724edd2dba2d9422adec2bc (patch)
treed4835a8bbbb23af3e8777dd1913ba2d3c06db385 /installerbuilder
parenta6534634432f8979d4fe9cb52d33da6e936521d3 (diff)
Fix typos, missing dots, superfluous dots...
Change-Id: I5e0659dee2cc9272dbb694d54f829424e0039cf8 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp2
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp6
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp28
-rw-r--r--installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp6
4 files changed, 21 insertions, 21 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
index fbb7b5d28..87bb9ca16 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
@@ -1458,7 +1458,7 @@ void SignatureVerificationDownloader::dataDownloadCompleted()
delete d->sigDownloader;
d->sigDownloader = FileDownloaderFactory::instance().create(url.scheme(), this);
if (!d->sigDownloader) {
- setDownloadAborted(tr("Could not download signature: scheme %1 not supported").arg(url.scheme()));
+ setDownloadAborted(tr("Could not download signature: scheme %1 not supported.").arg(url.scheme()));
return;
}
d->sigDownloader->setUrl(url);
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp
index 12bc4bd1c..48ec891ef 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterpackagesinfo.cpp
@@ -281,7 +281,7 @@ void PackagesInfo::refresh()
// if the file does not exist then we just skip the reading
if (!file.exists()) {
d->error = NotYetReadError;
- d->errorMessage = tr("The file \"%1\" does not exist").arg(d->fileName);
+ d->errorMessage = tr("The file \"%1\" does not exist.").arg(d->fileName);
emit reset();
return;
}
@@ -289,7 +289,7 @@ void PackagesInfo::refresh()
// Open Packages.xml
if (!file.open(QFile::ReadOnly)) {
d->error = CouldNotReadPackageFileError;
- d->errorMessage = tr("Could not open \"%1\"").arg(d->fileName);
+ d->errorMessage = tr("Could not open \"%1\".").arg(d->fileName);
emit reset();
return;
}
@@ -314,7 +314,7 @@ void PackagesInfo::refresh()
// Now populate information from the XML file.
QDomElement rootE = doc.documentElement();
if (rootE.tagName() != QLatin1String("Packages")) {
- d->setInvalidContentError(tr("root element %1 unexpected, should be \"Packages\"").arg(rootE.tagName()));
+ d->setInvalidContentError(tr("Root element %1 unexpected, should be \"Packages\".").arg(rootE.tagName()));
emit reset();
return;
}
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
index 181f27faf..6c13482de 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdateoperations.cpp
@@ -109,7 +109,7 @@ void CopyOperation::backup()
// in QFile::copy...
const bool success = QFile::rename(dest, value(QLatin1String("backupOfExistingDestination")).toString());
if (!success)
- setError(UserDefinedError, tr("Could not backup file %1").arg(dest));
+ setError(UserDefinedError, tr("Could not backup file %1.").arg(dest));
}
bool CopyOperation::performOperation()
@@ -133,7 +133,7 @@ bool CopyOperation::performOperation()
QFile file(dest);
if (!file.remove()) {
setError(UserDefinedError);
- setErrorString(tr("Could not remove destination file %1: %2.").arg(dest, file.errorString()));
+ setErrorString(tr("Could not remove destination file %1: %2").arg(dest, file.errorString()));
return false;
}
}
@@ -142,7 +142,7 @@ bool CopyOperation::performOperation()
const bool copied = file.copy(dest);
if (!copied) {
setError(UserDefinedError);
- setErrorString(tr("Could not copy %1 to %2: %3.").arg(source, dest, file.errorString()));
+ setErrorString(tr("Could not copy %1 to %2: %3").arg(source, dest, file.errorString()));
}
return copied;
}
@@ -230,7 +230,7 @@ void MoveOperation::backup()
// in QFile::copy...
const bool success = QFile::rename(dest, value(QLatin1String("backupOfExistingDestination")).toString());
if (!success)
- setError(UserDefinedError, tr("Could not backup file %1").arg(dest));
+ setError(UserDefinedError, tr("Could not backup file %1.").arg(dest));
}
bool MoveOperation::performOperation()
@@ -255,7 +255,7 @@ bool MoveOperation::performOperation()
QFile file(dest);
if (!file.remove(dest)) {
setError(UserDefinedError);
- setErrorString(tr("Could not remove destination file %1: %2.").arg(dest, file.errorString()));
+ setErrorString(tr("Could not remove destination file %1: %2").arg(dest, file.errorString()));
return false;
}
}
@@ -265,7 +265,7 @@ bool MoveOperation::performOperation()
const bool copied = file.copy(source, dest);
if (!copied) {
setError(UserDefinedError);
- setErrorString(tr("Could not copy %1 to %2: %3.").arg(source, dest, file.errorString()));
+ setErrorString(tr("Could not copy %1 to %2: %3").arg(source, dest, file.errorString()));
return false;
}
@@ -287,7 +287,7 @@ bool MoveOperation::undoOperation()
// second: delete the move destination
if (!deleteFileNowOrLater(dest)) {
- setError(UserDefinedError, tr("Cannot remove file %1"));
+ setError(UserDefinedError, tr("Cannot remove file %1."));
return false;
}
@@ -544,7 +544,7 @@ bool RmdirOperation::performOperation()
setValue(QLatin1String("removed"), removed);
if (!removed) {
setError(UserDefinedError);
- setErrorString(tr("Could not remove folder %1: %2.").arg(dirName, QLatin1String(strerror(errno))));
+ setErrorString(tr("Could not remove folder %1: %2").arg(dirName, QLatin1String(strerror(errno))));
}
return removed;
}
@@ -621,7 +621,7 @@ bool AppendFileOperation::performOperation()
if (!QFile::rename(fName, newName) && QFile::copy(newName, fName) && file.open(QFile::Append)) {
QFile::rename(newName, fName);
setError(UserDefinedError);
- setErrorString(tr("Could not open file %1 for writing: %2.").arg(file.fileName(), file.errorString()));
+ setErrorString(tr("Could not open file %1 for writing: %2").arg(file.fileName(), file.errorString()));
return false;
}
deleteFileNowOrLater(newName);
@@ -640,7 +640,7 @@ bool AppendFileOperation::undoOperation()
const QString filename = arguments().first();
const QString backupOfFile = value(QLatin1String("backupOfFile")).toString();
if (!backupOfFile.isEmpty() && !QFile::exists(backupOfFile)) {
- setError(UserDefinedError, tr("Cannot find backup file for %1").arg(filename));
+ setError(UserDefinedError, tr("Cannot find backup file for %1.").arg(filename));
return false;
}
@@ -716,7 +716,7 @@ bool PrependFileOperation::performOperation()
QFile file(fName);
if (!file.open(QFile::ReadOnly)) {
setError(UserDefinedError);
- setErrorString(tr("Could not open file %1 for reading: %2.").arg(file.fileName(), file.errorString()));
+ setErrorString(tr("Could not open file %1 for reading: %2").arg(file.fileName(), file.errorString()));
return false;
}
QString fContents(QLatin1String(file.readAll()));
@@ -732,7 +732,7 @@ bool PrependFileOperation::performOperation()
if (!QFile::rename(fName, newName) && QFile::copy(newName, fName) && file.open(QFile::WriteOnly)) {
QFile::rename(newName, fName);
setError(UserDefinedError);
- setErrorString(tr("Could not open file %1 for writing: %2.").arg(file.fileName(), file.errorString()));
+ setErrorString(tr("Could not open file %1 for writing: %2").arg(file.fileName(), file.errorString()));
return false;
}
deleteFileNowOrLater(newName);
@@ -750,12 +750,12 @@ bool PrependFileOperation::undoOperation()
const QString filename = arguments().first();
const QString backupOfFile = value(QLatin1String("backupOfFile")).toString();
if (!backupOfFile.isEmpty() && !QFile::exists(backupOfFile)) {
- setError(UserDefinedError, tr("Cannot find backup file for %1").arg(filename));
+ setError(UserDefinedError, tr("Cannot find backup file for %1.").arg(filename));
return false;
}
if (!deleteFileNowOrLater(filename)) {
- setError(UserDefinedError, tr("Cannot restore backup file for %1").arg(filename));
+ setError(UserDefinedError, tr("Cannot restore backup file for %1.").arg(filename));
return false;
}
diff --git a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
index 591971c5f..349a66169 100644
--- a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
+++ b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
@@ -676,7 +676,7 @@ void ListArchiveJob::doStart()
{
try {
if (!d->archive)
- throw SevenZipException(tr("Could not list archive: QIODevice already destroyed"));
+ throw SevenZipException(tr("Could not list archive: QIODevice already destroyed."));
d->files = listArchive(d->archive);
} catch (const SevenZipException& e) {
setError(Failed);
@@ -796,7 +796,7 @@ public:
f.remove();
#ifdef Q_OS_WIN
if (!CreateHardLinkWrapper(fi.absoluteFilePath(), QLatin1String(path))) {
- throw SevenZipException(QObject::tr("Could not create file system lik at %1")
+ throw SevenZipException(QObject::tr("Could not create file system link at %1")
.arg(fi.absoluteFilePath()));
}
#else
@@ -1352,7 +1352,7 @@ void ExtractItemJob::doStart()
{
try {
if (!d->archive)
- throw SevenZipException(tr("Could not list archive: QIODevice not set or already destroyed"));
+ throw SevenZipException(tr("Could not list archive: QIODevice not set or already destroyed."));
if (d->target)
extractArchive(d->archive, d->item, d->target, d->callback);
else if (!d->item.path.isEmpty())