summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-06-02 16:54:31 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-06-23 13:25:23 +0300
commit76c0b1f539058472a6c6de907069fa3569e2c702 (patch)
treeaa22c6e28eb3271ea18e03a0ad0b7878e94753b5 /src/libs/installer
parentf937a79971e2bb434fe47494049464774f6d4e41 (diff)
Translations: validate and update translatable user interface strings
Task-number: QTIFW-2245 Change-Id: Id9a79c7c572dc588c05ad37c67ae3f0431fa7cdb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/component.cpp4
-rw-r--r--src/libs/installer/componentselectionpage_p.cpp10
-rw-r--r--src/libs/installer/lib7z_facade.cpp4
-rw-r--r--src/libs/installer/metadatajob.cpp2
-rw-r--r--src/libs/installer/packagemanagercore.cpp16
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp8
-rw-r--r--src/libs/installer/packagemanagergui.cpp6
-rw-r--r--src/libs/installer/remoteclient_p.h4
-rw-r--r--src/libs/installer/selfrestartoperation.cpp2
-rw-r--r--src/libs/installer/settingsoperation.cpp2
10 files changed, 29 insertions, 29 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index b4b96eb08..0a768cd7f 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -1641,7 +1641,7 @@ void Component::updateModelData(const QString &key, const QString &data)
= QString::fromLatin1("<html><body>%1</body></html>").arg(d->m_vars.value(scDescription));
if (isUnstable()) {
tooltipText += QLatin1String("<br>") + tr("There was an error loading the selected component. "
- "This component can not be installed.");
+ "This component cannot be installed.");
}
setData(tooltipText, Qt::ToolTipRole);
} else {
@@ -1650,7 +1650,7 @@ void Component::updateModelData(const QString &key, const QString &data)
+ tr("Update Info: ") + updateInfo;
if (isUnstable()) {
tooltipText += QLatin1String("<br>") + tr("There was an error loading the selected component. "
- "This component can not be updated.");
+ "This component cannot be updated.");
}
setData(tooltipText, Qt::ToolTipRole);
diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp
index 974ae1502..b35c93bc4 100644
--- a/src/libs/installer/componentselectionpage_p.cpp
+++ b/src/libs/installer/componentselectionpage_p.cpp
@@ -110,14 +110,14 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
if (m_core->isInstaller()) {
m_checkDefault->setObjectName(QLatin1String("SelectDefaultComponentsButton"));
m_checkDefault->setShortcut(QKeySequence(ComponentSelectionPage::tr("Alt+A",
- "select default components")));
+ "Select default components")));
m_checkDefault->setText(ComponentSelectionPage::tr("Def&ault"));
m_checkDefault->setToolTip(ComponentSelectionPage::tr("Select default components in the tree view."));
} else {
m_checkDefault->setEnabled(false);
m_checkDefault->setObjectName(QLatin1String("ResetComponentsButton"));
m_checkDefault->setShortcut(QKeySequence(ComponentSelectionPage::tr("Alt+R",
- "reset to already installed components")));
+ "Reset to already installed components")));
m_checkDefault->setText(ComponentSelectionPage::tr("&Reset"));
m_checkDefault->setToolTip(
ComponentSelectionPage::tr("Reset all components to their original selection state in the tree view."));
@@ -129,7 +129,7 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
this, &ComponentSelectionPagePrivate::selectAll);
m_checkAll->setObjectName(QLatin1String("SelectAllComponentsButton"));
m_checkAll->setShortcut(QKeySequence(ComponentSelectionPage::tr("Alt+S",
- "select all components")));
+ "Select all components")));
m_checkAll->setText(ComponentSelectionPage::tr("&Select All"));
m_checkAll->setToolTip(ComponentSelectionPage::tr("Select all components in the tree view."));
buttonHLayout->addWidget(m_checkAll);
@@ -139,7 +139,7 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
this, &ComponentSelectionPagePrivate::deselectAll);
m_uncheckAll->setObjectName(QLatin1String("DeselectAllComponentsButton"));
m_uncheckAll->setShortcut(QKeySequence(ComponentSelectionPage::tr("Alt+D",
- "deselect all components")));
+ "Deselect all components")));
m_uncheckAll->setText(ComponentSelectionPage::tr("&Deselect All"));
m_uncheckAll->setToolTip(ComponentSelectionPage::tr("Deselect all components in the tree view."));
buttonHLayout->addWidget(m_uncheckAll);
@@ -243,7 +243,7 @@ void ComponentSelectionPagePrivate::setupCategoryLayout()
fetchCategoryButton->setObjectName(QLatin1String("FetchCategoryButton"));
fetchCategoryButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
fetchCategoryButton->setToolTip(
- ComponentSelectionPage::tr("Filter the enabled repository categories to selection."));
+ ComponentSelectionPage::tr("Filter the enabled repository categories"));
connect(fetchCategoryButton, &QPushButton::clicked, this,
&ComponentSelectionPagePrivate::fetchRepositoryCategories);
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index fc6ac7ae4..2f33c95e3 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -261,7 +261,7 @@ QString errorMessageFrom7zResult(const LONG &extractResult)
if (!lastError().isEmpty())
return lastError();
- QString errorMessage = QCoreApplication::translate("Lib7z", "internal code: %1");
+ QString errorMessage = QCoreApplication::translate("Lib7z", "Internal code: %1");
switch (extractResult) {
case S_OK:
qFatal("S_OK value is not a valid error code.");
@@ -282,7 +282,7 @@ QString errorMessageFrom7zResult(const LONG &extractResult)
errorMessage = errorMessage.arg(QLatin1String("STG_E_INVALIDFUNCTION"));
break;
case E_OUTOFMEMORY:
- errorMessage = QCoreApplication::translate("Lib7z", "not enough memory");
+ errorMessage = QCoreApplication::translate("Lib7z", "Not enough memory");
break;
case E_INVALIDARG:
errorMessage = errorMessage.arg(QLatin1String("E_INVALIDARG"));
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 2a9cb5ae7..690f5ac33 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -238,7 +238,7 @@ void MetadataJob::startXMLTask(const QList<FileTaskItem> &items)
void MetadataJob::doCancel()
{
reset();
- emitFinishedWithError(Job::Canceled, tr("Meta data download canceled."));
+ emitFinishedWithError(Job::Canceled, tr("Metadata download canceled."));
}
void MetadataJob::startUnzipRepositoryTask(const Repository &repo)
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 61b2273af..addb291eb 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -847,7 +847,7 @@ void PackageManagerCore::setNeedsHardRestart(bool needsHardRestart)
*/
void PackageManagerCore::rollBackInstallation()
{
- emit titleMessageChanged(tr("Cancelling the Installer"));
+ emit titleMessageChanged(tr("Canceling the Installer"));
// this unregisters all operation progressChanged connected
ProgressCoordinator::instance()->setUndoMode();
@@ -2302,7 +2302,7 @@ bool PackageManagerCore::checkComponentsForInstallation(const QStringList &compo
errorMessage.append(tr("Cannot install component %1. Component is installed only as automatic "
"dependency to %2.\n").arg(name, component->autoDependencies().join(QLatin1Char(','))));
} else if (!component->isCheckable()) {
- errorMessage.append(tr("Cannot install component %1. Component is not checkable meaning you "
+ errorMessage.append(tr("Cannot install component %1. Component is not checkable, meaning you "
"have to select one of the subcomponents.\n").arg(name));
}
} else if (component->isInstalled()) {
@@ -2320,7 +2320,7 @@ bool PackageManagerCore::checkComponentsForInstallation(const QStringList &compo
// We already checked the root component if there is no parent
return false;
} else if (trace->isVirtual()) {
- errorMessage.append(tr("Cannot install %1. Component is descendant "
+ errorMessage.append(tr("Cannot install %1. Component is a descendant "
"of a virtual component %2.\n").arg(name, trace->name()));
return true;
}
@@ -2744,21 +2744,21 @@ bool PackageManagerCore::checkAvailableSpace(QString &message) const
if (tempOnSameVolume && (installVolumeAvailableSize <= (required + tempRequired))) {
message = tr("Not enough disk space to store temporary files and the "
- "installation. %1 are available, while %2 are at least required.").arg(
+ "installation. %1 are available, while the minimum required is %2.").arg(
humanReadableSize(installVolumeAvailableSize), humanReadableSize(required + tempRequired));
return false;
}
if (installVolumeAvailableSize < required) {
message = tr("Not enough disk space to store all selected components! %1 are "
- "available while %2 are at least required.").arg(humanReadableSize(installVolumeAvailableSize),
+ "available, while the minimum required is %2.").arg(humanReadableSize(installVolumeAvailableSize),
humanReadableSize(required));
return false;
}
if (tempVolumeAvailableSize < tempRequired) {
- message = tr("Not enough disk space to store temporary files! %1 are available "
- "while %2 are at least required.").arg(humanReadableSize(tempVolumeAvailableSize),
+ message = tr("Not enough disk space to store temporary files! %1 are available, "
+ "while the minimum required is %2.").arg(humanReadableSize(tempVolumeAvailableSize),
humanReadableSize(tempRequired));
return false;
}
@@ -3986,7 +3986,7 @@ void PackageManagerCore::updateDisplayVersions(const QString &displayKey)
const QString displayVersionRemote = findDisplayVersion(key, componentsHash,
scVersion, visited);
if (displayVersionRemote.isEmpty())
- componentsHash.value(key)->setValue(displayKey, tr("invalid"));
+ componentsHash.value(key)->setValue(displayKey, tr("Invalid"));
else
componentsHash.value(key)->setValue(displayKey, displayVersionRemote);
}
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 0f1bb90be..d2f33c1b9 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2017,7 +2017,7 @@ bool PackageManagerCorePrivate::runUninstaller()
m_core->dropAdminRights();
ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(QString::fromLatin1("\n%1").arg(
- success ? tr("Uninstallation completed successfully.") : tr("Uninstallation aborted.")));
+ success ? tr("Removal completed successfully.") : tr("Removal aborted.")));
emit uninstallationFinished();
return success;
@@ -2309,7 +2309,7 @@ void PackageManagerCorePrivate::deleteMaintenanceTool()
QLatin1String("uninstall.vbs")).absoluteFilePath());
QFile f(batchfile);
if (!f.open(QIODevice::WriteOnly | QIODevice::Text))
- throw Error(tr("Cannot prepare uninstall"));
+ throw Error(tr("Cannot prepare removal"));
QTextStream batch(&f);
batch << "Set fso = WScript.CreateObject(\"Scripting.FileSystemObject\")\n";
@@ -2340,7 +2340,7 @@ void PackageManagerCorePrivate::deleteMaintenanceTool()
}
if (!QProcessWrapper::startDetached(QLatin1String("cscript"), arguments, QDir::rootPath()))
- throw Error(tr("Cannot start uninstall"));
+ throw Error(tr("Cannot start removal"));
#else
// every other platform has no problem if we just delete ourselves now
QFile maintenanceTool(QFileInfo(installerBinaryPath()).absoluteFilePath());
@@ -2438,7 +2438,7 @@ void PackageManagerCorePrivate::runUndoOperations(const OperationList &undoOpera
const QMessageBox::StandardButton button =
MessageBoxHandler::warning(MessageBoxHandler::currentBestSuitParent(),
QLatin1String("installationErrorWithIgnore"), tr("Installer Error"),
- tr("Error during uninstallation process:\n%1").arg(undoOperation->errorString()),
+ tr("Error during removal process:\n%1").arg(undoOperation->errorString()),
QMessageBox::Retry | QMessageBox::Ignore, QMessageBox::Ignore);
if (button == QMessageBox::Retry)
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index d761c0950..7190795e0 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -945,7 +945,7 @@ void PackageManagerGui::cancelButtonClicked()
interrupt = true;
question = tr("Do you want to cancel the installation process?");
if (m_core->isUninstaller())
- question = tr("Do you want to cancel the uninstallation process?");
+ question = tr("Do you want to cancel the removal process?");
} else {
question = tr("Do you want to quit the installer application?");
if (m_core->isUninstaller())
@@ -1963,7 +1963,7 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core)
layout->addWidget(licenseSplitter);
m_acceptCheckBox = new QCheckBox(this);
- m_acceptCheckBox->setShortcut(QKeySequence(tr("Alt+A", "agree license")));
+ m_acceptCheckBox->setShortcut(QKeySequence(tr("Alt+A", "Agree license")));
m_acceptCheckBox->setObjectName(QLatin1String("AcceptLicenseCheckBox"));
ClickForwarder *acceptClickForwarder = new ClickForwarder(m_acceptCheckBox);
@@ -2307,7 +2307,7 @@ TargetDirectoryPage::TargetDirectoryPage(PackageManagerCore *core)
QPushButton *browseButton = new QPushButton(this);
browseButton->setObjectName(QLatin1String("BrowseDirectoryButton"));
connect(browseButton, &QAbstractButton::clicked, this, &TargetDirectoryPage::dirRequested);
- browseButton->setShortcut(QKeySequence(tr("Alt+R", "browse file system to choose a file")));
+ browseButton->setShortcut(QKeySequence(tr("Alt+R", "Browse file system to choose a file")));
browseButton->setText(tr("B&rowse..."));
browseButton->setToolTip(TargetDirectoryPage::tr("Browse file system to choose the installation directory."));
hlayout->addWidget(browseButton);
diff --git a/src/libs/installer/remoteclient_p.h b/src/libs/installer/remoteclient_p.h
index ba60bc7ac..9cc679de8 100644
--- a/src/libs/installer/remoteclient_p.h
+++ b/src/libs/installer/remoteclient_p.h
@@ -133,8 +133,8 @@ public:
QCoreApplication::translate("RemoteClient", "Cannot get authorization."),
QCoreApplication::translate("RemoteClient",
"Cannot get authorization that is needed for continuing the installation.\n\n"
- "Please start the setup program as a user with the appropriate rights.\n"
- "Or accept the elevation of access rights if being asked."),
+ "Please start the setup program as a user with the appropriate rights,\n"
+ "or accept the elevation of access rights if being asked."),
QMessageBox::Abort | QMessageBox::Retry, QMessageBox::Abort);
if (res == QMessageBox::Retry)
started = AdminAuthorization::execute(0, m_serverCommand, m_serverArguments);
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 8e53b8201..360dc60b2 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -61,7 +61,7 @@ bool SelfRestartOperation::performOperation()
if (!core->isMaintainer()) {
setError(UserDefinedError);
- setErrorString(tr("Self Restart: Only valid within updater or packagemanager mode."));
+ setErrorString(tr("Self Restart: Only valid within updater or package manager mode."));
return false;
}
diff --git a/src/libs/installer/settingsoperation.cpp b/src/libs/installer/settingsoperation.cpp
index 95ba5266d..c5fe8384c 100644
--- a/src/libs/installer/settingsoperation.cpp
+++ b/src/libs/installer/settingsoperation.cpp
@@ -82,7 +82,7 @@ bool SettingsOperation::checkArguments()
if (!possibleMethodValues.contains(method)) {
setError(InvalidArguments);
setErrorString(tr("Current method argument calling \"%1\" with arguments \"%2\" is not "
- "supported. Please use set, remove, add_array_value or remove_array_value.").arg(name(),
+ "supported. Please use set, remove, add_array_value, or remove_array_value.").arg(name(),
arguments().join(QLatin1String("; "))));
return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:45:16 +0000