From 03012cc175ffbaab763e103ff8da21ede023502e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 12 Sep 2021 16:45:00 +0800 Subject: [PATCH 1/3] Revise description wordings --- src/app/application.cpp | 4 ++-- src/base/bittorrent/session.cpp | 2 +- src/base/net/dnsupdater.cpp | 4 ++-- src/gui/aboutdialog.ui | 2 +- src/gui/addnewtorrentdialog.ui | 2 +- src/gui/advancedsettings.cpp | 2 +- src/gui/mainwindow.cpp | 8 ++++---- src/gui/mainwindow.ui | 2 +- src/gui/optionsdialog.ui | 2 +- src/gui/rss/automatedrssdownloader.ui | 4 ++-- src/webui/www/private/views/aboutToolbar.html | 2 +- src/webui/www/private/views/preferences.html | 2 +- src/webui/www/private/views/search.html | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index e87485751..80b0dd61d 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -665,8 +665,8 @@ int Application::exec(const QStringList ¶ms) if (pref->getWebUIPassword() == "ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtHAjU9b3b7uB8NR1Gur2hmQCvCDpm39Q+PsJRJPaCU51dEiz+dTzh8qbPsL8WkFljQYFQ==") { const QString warning = tr("The Web UI administrator username is: %1").arg(pref->getWebUiUsername()) + '\n' - + tr("The Web UI administrator password is still the default one: %1").arg("adminadmin") + '\n' - + tr("This is a security risk, please consider changing your password from program preferences.") + '\n'; + + tr("The Web UI administrator password has not been changed from the default: %1").arg("adminadmin") + '\n' + + tr("This is a security risk, please change your password in program preferences.") + '\n'; printf("%s", qUtf8Printable(warning)); } #endif // DISABLE_WEBUI diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 4773bd960..22726ff07 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -2929,7 +2929,7 @@ void Session::setBannedIPs(const QStringList &newList) } else { - LogMsg(tr("%1 is not a valid IP address and was rejected while applying the list of banned addresses.") + LogMsg(tr("%1 is not a valid IP address and was rejected while applying the list of banned IP addresses.") .arg(ip) , Log::WARNING); } diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp index e7dfb4495..0f213d02a 100644 --- a/src/base/net/dnsupdater.cpp +++ b/src/base/net/dnsupdater.cpp @@ -213,7 +213,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply) if (code == "badagent") { - logger->addMessage(tr("Dynamic DNS error: qBittorrent was blacklisted by the service, please report a bug at http://bugs.qbittorrent.org."), + logger->addMessage(tr("Dynamic DNS error: qBittorrent was blacklisted by the service, please submit a bug report at http://bugs.qbittorrent.org."), Log::CRITICAL); m_state = FATAL; return; @@ -221,7 +221,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply) if (code == "!donator") { - logger->addMessage(tr("Dynamic DNS error: %1 was returned by the service, please report a bug at http://bugs.qbittorrent.org.").arg("!donator"), + logger->addMessage(tr("Dynamic DNS error: %1 was returned by the service, please submit a bug report at http://bugs.qbittorrent.org.").arg("!donator"), Log::CRITICAL); m_state = FATAL; return; diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui index bcec8383a..8b64e880d 100644 --- a/src/gui/aboutdialog.ui +++ b/src/gui/aboutdialog.ui @@ -78,7 +78,7 @@ - Author + Authors diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui index ec15c27f0..3d5a66e8b 100644 --- a/src/gui/addnewtorrentdialog.ui +++ b/src/gui/addnewtorrentdialog.ui @@ -138,7 +138,7 @@ - When checked, the .torrent file will not be deleted despite the settings at the "Download" page of the options dialog + When checked, the .torrent file will not be deleted regardless of the settings at the "Download" page of the Options dialog Do not delete .torrent file diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp index 0b160a3c7..da61f6672 100644 --- a/src/gui/advancedsettings.cpp +++ b/src/gui/advancedsettings.cpp @@ -654,7 +654,7 @@ void AdvancedSettings::loadAdvancedSettings() addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP address to bind to"), &m_comboBoxInterfaceAddress); // Announce IP m_lineEditAnnounceIP.setText(session->announceIP()); - addRow(ANNOUNCE_IP, (tr("IP Address to report to trackers (requires restart)") + addRow(ANNOUNCE_IP, (tr("IP address reported to trackers (requires restart)") + ' ' + makeLink("https://www.libtorrent.org/reference-Settings.html#announce_ip", "(?)")) , &m_lineEditAnnounceIP); // Max concurrent HTTP announces diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 15a7ed5b6..cac39e4e0 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -461,7 +461,7 @@ MainWindow::MainWindow(QWidget *parent) if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet())) { if (QMessageBox::question(this, tr("Torrent file association"), - tr("qBittorrent is not the default application to open torrent files or Magnet links.\nDo you want to associate qBittorrent to torrent files and Magnet links?"), + tr("qBittorrent is not the default application for opening torrent files or Magnet links.\nDo you want to make qBittorrent the default application for these?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { Preferences::setTorrentFileAssoc(true); @@ -650,7 +650,7 @@ bool MainWindow::defineUILockPassword() if (newPassword.size() < 3) { - QMessageBox::warning(this, tr("Invalid password"), tr("The password should contain at least 3 characters")); + QMessageBox::warning(this, tr("Invalid password"), tr("The password must be at least 3 characters long")); return false; } @@ -871,7 +871,7 @@ void MainWindow::torrentNew(BitTorrent::Torrent *const torrent) const // called when a torrent has finished void MainWindow::finishedTorrent(BitTorrent::Torrent *const torrent) const { - showNotificationBaloon(tr("Download completion"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); + showNotificationBaloon(tr("Download completed"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); } // Notification when disk is full @@ -1469,6 +1469,7 @@ void MainWindow::activate() void MainWindow::optionsSaved() { + Logger::instance()->addMessage(tr("Options saved.")); loadPreferences(); } @@ -1491,7 +1492,6 @@ void MainWindow::showStatusBar(bool show) void MainWindow::loadPreferences(const bool configureSession) { - Logger::instance()->addMessage(tr("Options were saved successfully.")); const Preferences *const pref = Preferences::instance(); #ifdef Q_OS_MACOS Q_UNUSED(configureSession); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 12cfc3eee..a3e17d0db 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -390,7 +390,7 @@ true - &Disabled + &Do nothing diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index 3beb182bb..a30abc017 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -827,7 +827,7 @@ - Should the .torrent file be deleted after adding it + Whether the .torrent file should be deleted after adding it De&lete .torrent files afterwards diff --git a/src/gui/rss/automatedrssdownloader.ui b/src/gui/rss/automatedrssdownloader.ui index e80e2e800..5abbf1bd6 100644 --- a/src/gui/rss/automatedrssdownloader.ui +++ b/src/gui/rss/automatedrssdownloader.ui @@ -25,7 +25,7 @@ color: red; - Auto downloading of RSS torrents is disabled now! You can enable it in application settings. + Auto downloading of RSS torrents is currently disabled. You can enable it in application settings. true @@ -221,7 +221,7 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also - + diff --git a/src/webui/www/private/views/aboutToolbar.html b/src/webui/www/private/views/aboutToolbar.html index f5479b9e6..3d9afd0e6 100644 --- a/src/webui/www/private/views/aboutToolbar.html +++ b/src/webui/www/private/views/aboutToolbar.html @@ -1,7 +1,7 @@
    - + diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index f6c35c6ef..380d3c11b 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -1208,7 +1208,7 @@ - + diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html index fe5203ddd..f6c55e380 100644 --- a/src/webui/www/private/views/search.html +++ b/src/webui/www/private/views/search.html @@ -103,7 +103,7 @@
    - QBT_TR(Results (showing)QBT_TR[CONTEXT=SearchEngineWidget] 0 QBT_TR(out of)QBT_TR[CONTEXT=SearchEngineWidget] 0): + QBT_TR(Results)QBT_TR[CONTEXT=SearchEngineWidget] (QBT_TR(showing)QBT_TR[CONTEXT=SearchEngineWidget] 0 QBT_TR(out of)QBT_TR[CONTEXT=SearchEngineWidget] 0):
    From fc86034fab830d588b0bca6dd4089535821af464 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 12 Sep 2021 17:30:31 +0800 Subject: [PATCH 2/3] WebUI: update authors page --- src/webui/www/private/views/about.html | 39 ++++---------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html index 92042cb22..7f86f8a27 100644 --- a/src/webui/www/private/views/about.html +++ b/src/webui/www/private/views/about.html @@ -26,48 +26,19 @@
    -

    QBT_TR(Original authors)QBT_TR[CONTEXT=HttpServer]

    +

    QBT_TR(Original author)QBT_TR[CONTEXT=HttpServer]

    - + - - - -
    QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]Ishan AroraChristophe Dumez
    QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]ishanarora@gmail.com
    -
    - - - - - - - - - -
    QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]Ankit Gupta
    QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]ank.iitd@gmail.com
    -
    - - - - - - - - - -
    QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]Chandan Shikhar Dua
    QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]shikhar.ap@gmail.com
    -
    - - - - + + - +
    QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]Swapnil KumarQBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]QBT_TR(France)QBT_TR[CONTEXT=AboutDialog]
    QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]swapnil.iitd@gmail.comchris@qbittorrent.org
    From 46394a7c0fa833b5a35ebe572ed48338ee3f6cb1 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 12 Sep 2021 20:53:16 +0800 Subject: [PATCH 3/3] Combine stream statements --- src/app/cmdoptions.cpp | 84 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/app/cmdoptions.cpp b/src/app/cmdoptions.cpp index 15cb4a85a..5baee490a 100644 --- a/src/app/cmdoptions.cpp +++ b/src/app/cmdoptions.cpp @@ -526,55 +526,55 @@ QString makeUsage(const QString &prgName) QTextStream stream(&text, QIODevice::WriteOnly); QString indentation = QString(USAGE_INDENTATION, ' '); - stream << QObject::tr("Usage:") << '\n'; - stream << indentation << prgName << QLatin1String(" [options] [( | )...]") << '\n'; + stream << QObject::tr("Usage:") << '\n' + << indentation << prgName << QLatin1String(" [options] [( | )...]") << '\n' - stream << QObject::tr("Options:") << '\n'; + << QObject::tr("Options:") << '\n' #if !defined(Q_OS_WIN) || defined(DISABLE_GUI) - stream << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n'; + << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n' #endif - stream << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n'; - stream << WEBUI_PORT_OPTION.usage(QObject::tr("port")) - << wrapText(QObject::tr("Change the Web UI port")) - << '\n'; + << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n' + << WEBUI_PORT_OPTION.usage(QObject::tr("port")) + << wrapText(QObject::tr("Change the Web UI port")) + << '\n' #ifndef DISABLE_GUI - stream << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n'; + << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n' #elif !defined(Q_OS_WIN) - stream << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n'; + << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n' #endif //: Use appropriate short form or abbreviation of "directory" - stream << PROFILE_OPTION.usage(QObject::tr("dir")) - << wrapText(QObject::tr("Store configuration files in ")) << '\n'; - stream << CONFIGURATION_OPTION.usage(QObject::tr("name")) - << wrapText(QObject::tr("Store configuration files in directories qBittorrent_")) << '\n'; - stream << RELATIVE_FASTRESUME.usage() - << wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative " - "to the profile directory")) << '\n'; - stream << Option::padUsageText(QObject::tr("files or URLs")) - << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n' - << '\n'; - - stream << wrapText(QObject::tr("Options when adding new torrents:"), 0) << '\n'; - stream << SAVE_PATH_OPTION.usage(QObject::tr("path")) << wrapText(QObject::tr("Torrent save path")) << '\n'; - stream << PAUSED_OPTION.usage() << wrapText(QObject::tr("Add torrents as started or paused")) << '\n'; - stream << SKIP_HASH_CHECK_OPTION.usage() << wrapText(QObject::tr("Skip hash check")) << '\n'; - stream << CATEGORY_OPTION.usage(QObject::tr("name")) - << wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be " - "created.")) << '\n'; - stream << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n'; - stream << FIRST_AND_LAST_OPTION.usage() - << wrapText(QObject::tr("Download first and last pieces first")) << '\n'; - stream << SKIP_DIALOG_OPTION.usage() - << wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a " - "torrent.")) << '\n'; - stream << '\n'; - - stream << wrapText(QObject::tr("Option values may be supplied via environment variables. For option named " - "'parameter-name', environment variable name is 'QBT_PARAMETER_NAME' (in upper " - "case, '-' replaced with '_'). To pass flag values, set the variable to '1' or " - "'TRUE'. For example, to disable the splash screen: "), 0) << "\n" - << QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n' - << wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n'; + << PROFILE_OPTION.usage(QObject::tr("dir")) + << wrapText(QObject::tr("Store configuration files in ")) << '\n' + << CONFIGURATION_OPTION.usage(QObject::tr("name")) + << wrapText(QObject::tr("Store configuration files in directories qBittorrent_")) << '\n' + << RELATIVE_FASTRESUME.usage() + << wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative " + "to the profile directory")) << '\n' + << Option::padUsageText(QObject::tr("files or URLs")) + << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n' + << '\n' + + << wrapText(QObject::tr("Options when adding new torrents:"), 0) << '\n' + << SAVE_PATH_OPTION.usage(QObject::tr("path")) << wrapText(QObject::tr("Torrent save path")) << '\n' + << PAUSED_OPTION.usage() << wrapText(QObject::tr("Add torrents as started or paused")) << '\n' + << SKIP_HASH_CHECK_OPTION.usage() << wrapText(QObject::tr("Skip hash check")) << '\n' + << CATEGORY_OPTION.usage(QObject::tr("name")) + << wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be " + "created.")) << '\n' + << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n' + << FIRST_AND_LAST_OPTION.usage() + << wrapText(QObject::tr("Download first and last pieces first")) << '\n' + << SKIP_DIALOG_OPTION.usage() + << wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a " + "torrent.")) << '\n' + << '\n' + + << wrapText(QObject::tr("Option values may be supplied via environment variables. For option named " + "'parameter-name', environment variable name is 'QBT_PARAMETER_NAME' (in upper " + "case, '-' replaced with '_'). To pass flag values, set the variable to '1' or " + "'TRUE'. For example, to disable the splash screen: "), 0) << "\n" + << QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n' + << wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n'; return text; }