From d28b5f7834c0573ba6ab60892294e95e3e73c9c2 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 22 Aug 2022 11:36:13 +0800 Subject: [PATCH] Rephrase `confirm deletion` dialog Closes #14309. PR #17586. Co-authored-by: xavier2k6 <42386382+xavier2k6@users.noreply.github.com> --- src/gui/deletionconfirmationdialog.cpp | 5 +++-- src/gui/deletionconfirmationdialog.ui | 2 +- src/webui/www/private/confirmdeletion.html | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gui/deletionconfirmationdialog.cpp b/src/gui/deletionconfirmationdialog.cpp index 7a421f78a..0bbb0a5da 100644 --- a/src/gui/deletionconfirmationdialog.cpp +++ b/src/gui/deletionconfirmationdialog.cpp @@ -42,9 +42,9 @@ DeletionConfirmationDialog::DeletionConfirmationDialog(QWidget *parent, const in m_ui->setupUi(this); if (size == 1) - m_ui->label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); + m_ui->label->setText(tr("Are you sure you want to remove '%1' from the transfer list?", "Are you sure you want to remove 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); else - m_ui->label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); + m_ui->label->setText(tr("Are you sure you want to remove these %1 torrents from the transfer list?", "Are you sure you want to remove these 5 torrents from the transfer list?").arg(QString::number(size))); // Icons const QSize iconSize = Utils::Gui::largeIconSize(); @@ -55,6 +55,7 @@ DeletionConfirmationDialog::DeletionConfirmationDialog(QWidget *parent, const in m_ui->checkPermDelete->setChecked(defaultDeleteFiles || Preferences::instance()->deleteTorrentFilesAsDefault()); connect(m_ui->checkPermDelete, &QCheckBox::clicked, this, &DeletionConfirmationDialog::updateRememberButtonState); + m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Remove")); m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setFocus(); } diff --git a/src/gui/deletionconfirmationdialog.ui b/src/gui/deletionconfirmationdialog.ui index db2019c44..87a4ff74b 100644 --- a/src/gui/deletionconfirmationdialog.ui +++ b/src/gui/deletionconfirmationdialog.ui @@ -88,7 +88,7 @@ - Also delete the files on the hard disk + Also permanently delete the files diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html index c048108a2..78d02fa37 100644 --- a/src/webui/www/private/confirmdeletion.html +++ b/src/webui/www/private/confirmdeletion.html @@ -44,10 +44,10 @@
-

  QBT_TR(Are you sure you want to delete the selected torrents from the transfer list?)QBT_TR[CONTEXT=HttpServer]

-     

+

  QBT_TR(Are you sure you want to remove the selected torrents from the transfer list?)QBT_TR[CONTEXT=HttpServer]

+     

-      +