From 7b0644cdcd857b371953555d2a0f1e6715a67bff Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 22 Aug 2022 18:54:59 +0800 Subject: [PATCH] Use proper verb when referring to torrent removal --- src/gui/categoryfilterwidget.cpp | 2 +- src/gui/deletionconfirmationdialog.ui | 4 ++-- src/gui/mainwindow.ui | 2 +- src/gui/tagfilterwidget.cpp | 2 +- src/gui/transferlistfilterswidget.cpp | 4 ++-- src/gui/transferlistwidget.cpp | 2 +- src/webui/www/private/confirmdeletion.html | 2 +- src/webui/www/private/index.html | 12 ++++++------ src/webui/www/private/scripts/mocha-init.js | 8 ++++---- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp index 8e4253ac8..61a77f049 100644 --- a/src/gui/categoryfilterwidget.cpp +++ b/src/gui/categoryfilterwidget.cpp @@ -134,7 +134,7 @@ void CategoryFilterWidget::showMenu() , this, &CategoryFilterWidget::actionResumeTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , this, &CategoryFilterWidget::actionPauseTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove torrents") , this, &CategoryFilterWidget::actionDeleteTorrentsTriggered); menu->popup(QCursor::pos()); diff --git a/src/gui/deletionconfirmationdialog.ui b/src/gui/deletionconfirmationdialog.ui index 87a4ff74b..1a813b8b3 100644 --- a/src/gui/deletionconfirmationdialog.ui +++ b/src/gui/deletionconfirmationdialog.ui @@ -17,7 +17,7 @@ - Deletion confirmation + Remove torrent(s) @@ -44,7 +44,7 @@ - deletion message goes here + message goes here Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 1a8d7d259..1a44708cd 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -208,7 +208,7 @@ - &Delete + &Remove diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp index 0f9262600..7d971c516 100644 --- a/src/gui/tagfilterwidget.cpp +++ b/src/gui/tagfilterwidget.cpp @@ -124,7 +124,7 @@ void TagFilterWidget::showMenu() , this, &TagFilterWidget::actionResumeTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , this, &TagFilterWidget::actionPauseTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove torrents") , this, &TagFilterWidget::actionDeleteTorrentsTriggered); menu->popup(QCursor::pos()); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 977055c5c..b3c80a010 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -307,7 +307,7 @@ void StatusFilterWidget::showMenu() , transferList, &TransferListWidget::startVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); menu->popup(QCursor::pos()); @@ -712,7 +712,7 @@ void TrackerFiltersList::showMenu() , transferList, &TransferListWidget::startVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); menu->popup(QCursor::pos()); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 9cb93cbf0..4f9829e91 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -915,7 +915,7 @@ void TransferListWidget::displayListMenu() connect(actionPause, &QAction::triggered, this, &TransferListWidget::pauseSelectedTorrents); auto *actionForceStart = new QAction(UIThemeManager::instance()->getIcon(u"torrent-start-forced"_qs), tr("Force Resu&me", "Force Resume/start the torrent"), listMenu); connect(actionForceStart, &QAction::triggered, this, &TransferListWidget::forceStartSelectedTorrents); - auto *actionDelete = new QAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("&Delete", "Delete the torrent"), listMenu); + auto *actionDelete = new QAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("&Remove", "Remove the torrent"), listMenu); connect(actionDelete, &QAction::triggered, this, &TransferListWidget::softDeleteSelectedTorrents); auto *actionPreviewFile = new QAction(UIThemeManager::instance()->getIcon(u"view-preview"_qs), tr("Pre&view file..."), listMenu); connect(actionPreviewFile, &QAction::triggered, this, &TransferListWidget::previewSelectedTorrents); diff --git a/src/webui/www/private/confirmdeletion.html b/src/webui/www/private/confirmdeletion.html index 78d02fa37..6ce0174e8 100644 --- a/src/webui/www/private/confirmdeletion.html +++ b/src/webui/www/private/confirmdeletion.html @@ -3,7 +3,7 @@ - QBT_TR(Deletion confirmation - qBittorrent)QBT_TR[CONTEXT=confirmDeletionDlg] + QBT_TR(Remove torrent(s))QBT_TR[CONTEXT=confirmDeletionDlg] diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 964ae7dd2..ef1a01755 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -61,7 +61,7 @@
  • QBT_TR(Pause All)QBT_TR[CONTEXT=MainWindow]QBT_TR(Pause All)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Resume)QBT_TR[CONTEXT=MainWindow]QBT_TR(Resume)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Pause)QBT_TR[CONTEXT=MainWindow]QBT_TR(Pause)QBT_TR[CONTEXT=MainWindow]
    • -
  • QBT_TR(Delete)QBT_TR[CONTEXT=MainWindow]QBT_TR(Delete)QBT_TR[CONTEXT=MainWindow]
    • +
  • QBT_TR(Remove)QBT_TR[CONTEXT=MainWindow]QBT_TR(Remove)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Top of Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Top of Queue)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow]
    • @@ -102,7 +102,7 @@    QBT_TR(Add Torrent Link...)QBT_TR[CONTEXT=MainWindow] QBT_TR(Add Torrent File...)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Remove)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Resume)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Pause)QBT_TR[CONTEXT=TransferListWidget] @@ -132,7 +132,7 @@
  • QBT_TR(Resume)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Resume)QBT_TR[CONTEXT=TransferListWidget]
  • QBT_TR(Pause)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Pause)QBT_TR[CONTEXT=TransferListWidget]
  • QBT_TR(Force Resume)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force Resume)QBT_TR[CONTEXT=TransferListWidget]
    • -
  • QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget]
    • +
  • QBT_TR(Remove)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Remove)QBT_TR[CONTEXT=TransferListWidget]
  • QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Rename...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Rename...)QBT_TR[CONTEXT=TransferListWidget] @@ -186,7 +186,7 @@
  • QBT_TR(Remove unused categories)QBT_TR[CONTEXT=CategoryFilterWidget] QBT_TR(Remove unused categories)QBT_TR[CONTEXT=CategoryFilterWidget]
  • QBT_TR(Resume torrents)QBT_TR[CONTEXT=CategoryFilterWidget] QBT_TR(Resume torrents)QBT_TR[CONTEXT=CategoryFilterWidget]
  • QBT_TR(Pause torrents)QBT_TR[CONTEXT=CategoryFilterWidget] QBT_TR(Pause torrents)QBT_TR[CONTEXT=CategoryFilterWidget]
    • -
  • QBT_TR(Delete torrents)QBT_TR[CONTEXT=CategoryFilterWidget] QBT_TR(Delete torrents)QBT_TR[CONTEXT=CategoryFilterWidget]
    • +
  • QBT_TR(Remove torrents)QBT_TR[CONTEXT=CategoryFilterWidget] QBT_TR(Remove torrents)QBT_TR[CONTEXT=CategoryFilterWidget]
    • QBT_TR(Add a new tracker...)QBT_TR[CONTEXT=TrackerListWidget] QBT_TR(Add a new tracker...)QBT_TR[CONTEXT=TrackerListWidget]
      • diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index 6e0c9a85f..dd93e4d4c 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -382,7 +382,7 @@ const initializeWindows = function() { if (hashes.length) { new MochaUI.Window({ id: 'confirmDeletionPage', - title: "QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=confirmDeletionDlg]", + title: "QBT_TR(Remove torrent(s))QBT_TR[CONTEXT=confirmDeletionDlg]", loadMethod: 'iframe', contentURL: new URI("confirmdeletion.html").setData("hashes", hashes.join("|")).setData("deleteFiles", deleteFiles).toString(), scrollbars: false, @@ -659,7 +659,7 @@ const initializeWindows = function() { if (hashes.length) { new MochaUI.Window({ id: 'confirmDeletionPage', - title: "QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=confirmDeletionDlg]", + title: "QBT_TR(Remove torrent(s))QBT_TR[CONTEXT=confirmDeletionDlg]", loadMethod: 'iframe', contentURL: new URI("confirmdeletion.html").setData("hashes", hashes.join("|")).toString(), scrollbars: false, @@ -800,7 +800,7 @@ const initializeWindows = function() { if (hashes.length) { new MochaUI.Window({ id: 'confirmDeletionPage', - title: "QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=confirmDeletionDlg]", + title: "QBT_TR(Remove torrent(s))QBT_TR[CONTEXT=confirmDeletionDlg]", loadMethod: 'iframe', contentURL: new URI("confirmdeletion.html").setData("hashes", hashes.join("|")).toString(), scrollbars: false, @@ -886,7 +886,7 @@ const initializeWindows = function() { if (hashes.length) { new MochaUI.Window({ id: 'confirmDeletionPage', - title: "QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=confirmDeletionDlg]", + title: "QBT_TR(Remove torrent(s))QBT_TR[CONTEXT=confirmDeletionDlg]", loadMethod: 'iframe', contentURL: new URI("confirmdeletion.html").setData("hashes", hashes.join("|")).toString(), scrollbars: false,