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 @@