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/packagemanagercore.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/packagemanagercore.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 9efee0465..1bb800b4a 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -657,7 +657,7 @@ int PackageManagerCore::downloadNeededArchives(double partProgressSize) throw Error(archivesJob.errorString()); if (d->statusCanceledOrFailed()) - throw Error(tr("Installation canceled by user")); + throw Error(tr("Installation canceled by user.")); ProgressCoordinator::instance()->emitDownloadStatus(tr("All downloads finished.")); @@ -749,7 +749,7 @@ void PackageManagerCore::rollBackInstallation() } catch (const Error &e) { MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("ElevationError"), tr("Authentication Error"), tr("Some components " - "could not be removed completely because admin rights could not be acquired: %1.") + "could not be removed completely because administrative rights could not be acquired: %1.") .arg(e.message())); } catch (...) { MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("unknown"), @@ -966,7 +966,7 @@ bool PackageManagerCore::fetchLocalPackagesTree() d->setStatus(Running); if (!isPackageManager()) { - d->setStatus(Failure, tr("Application not running in Package Manager mode!")); + d->setStatus(Failure, tr("Application not running in Package Manager mode.")); return false; } @@ -988,7 +988,7 @@ bool PackageManagerCore::fetchLocalPackagesTree() component->loadDataFromPackage(installedPackages.value(key)); const QString &name = component->name(); if (components.contains(name)) { - qCritical("Could not register component! Component with identifier %s already registered.", + qCritical("Cannot register component! Component with identifier %s already registered.", qPrintable(name)); continue; } @@ -1074,7 +1074,7 @@ bool PackageManagerCore::fetchRemotePackagesTree() d->setStatus(Running); if (isUninstaller()) { - d->setStatus(Failure, tr("Application running in Uninstaller mode!")); + d->setStatus(Failure, tr("Application running in Uninstaller mode.")); return false; } @@ -2330,7 +2330,7 @@ bool PackageManagerCore::updateComponentData(struct Data &data, Component *compo // check if we already added the component to the available components list const QString name = data.package->data(scName).toString(); if (data.components->contains(name)) { - qCritical("Could not register component! Component with identifier %s already registered.", + qCritical("Cannot register component! Component with identifier %s already registered.", qPrintable(name)); return false; } |