mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-28 05:27:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revise description wordings

Browse source
This commit is contained in:
Chocobo1 2021-09-12 16:45:00 +08:00
parent ce0b6f0d56
commit 03012cc175
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
13 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/application.cpp
View file

@ -665,8 +665,8 @@ int Application::exec(const QStringList &params)
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

2
src/base/bittorrent/session.cpp
View file

@ -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);
}

4
src/base/net/dnsupdater.cpp
View file

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

2
src/gui/aboutdialog.ui
View file

@ -78,7 +78,7 @@
</widget>
<widget class="QWidget" name="authorTab">
<attribute name="title">
<string>Author</string>
<string>Authors</string>
</attribute>
<layout class="QVBoxLayout" name="authorTabLayout">
<item>

2
src/gui/addnewtorrentdialog.ui
View file

@ -138,7 +138,7 @@
<item row="2" column="0">
<widget class="QCheckBox" name="doNotDeleteTorrentCheckBox">
<property name="toolTip">
<string>When checked, the .torrent file will not be deleted despite the settings at the &quot;Download&quot; page of the options dialog</string>
<string>When checked, the .torrent file will not be deleted regardless of the settings at the &quot;Download&quot; page of the Options dialog</string>
</property>
<property name="text">
<string>Do not delete .torrent file</string>

2
src/gui/advancedsettings.cpp
View file

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

8
src/gui/mainwindow.cpp
View file

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

2
src/gui/mainwindow.ui
View file

@ -390,7 +390,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Disabled</string>
<string>&amp;Do nothing</string>
</property>
</action>
<action name="actionToggleVisibility">

2
src/gui/optionsdialog.ui
View file

@ -827,7 +827,7 @@
<item>
<widget class="QGroupBox" name="deleteTorrentBox">
<property name="toolTip">
<string>Should the .torrent file be deleted after adding it</string>
<string>Whether the .torrent file should be deleted after adding it</string>
</property>
<property name="title">
<string>De&amp;lete .torrent files afterwards </string>

4
src/gui/rss/automatedrssdownloader.ui
View file

@ -25,7 +25,7 @@
<string notr="true">color: red;</string>
</property>
<property name="text">
<string>Auto downloading of RSS torrents is disabled now! You can enable it in application settings.</string>
<string>Auto downloading of RSS torrents is currently disabled. You can enable it in application settings.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -221,7 +221,7 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
</widget>
</item>
<item>
<widget class="QToolButton" name="addCategoryBtn" />
<widget class="QToolButton" name="addCategoryBtn"/>
</item>
</layout>
</item>

2
src/webui/www/private/views/aboutToolbar.html
View file

@ -1,7 +1,7 @@
<div class="toolbarTabs">
<ul id="aboutTabs" class="tab-menu">
<li id="aboutAboutLink" class="selected"><a>QBT_TR(About)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutAuthorLink"><a>QBT_TR(Author)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutAuthorLink"><a>QBT_TR(Authors)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutSpecialThanksLink"><a>QBT_TR(Special Thanks)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutTranslatorsLink"><a>QBT_TR(Translators)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutLicenseLink"><a>QBT_TR(License)QBT_TR[CONTEXT=AboutDialog]</a></li>

2
src/webui/www/private/views/preferences.html
View file

@ -1208,7 +1208,7 @@
</tr>
<tr>
<td>
<label for="announceIP">QBT_TR(IP Address to report to trackers (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_ip" target="_blank">(?)</a></label>
<label for="announceIP">QBT_TR(IP address reported to trackers (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_ip" target="_blank">(?)</a></label>
</td>
<td>
<input type="text" id="announceIP" style="width: 15em;" />

2
src/webui/www/private/views/search.html
View file

@ -103,7 +103,7 @@
<div id="searchResultsFilters">
<input type="text" id="searchInNameFilter" placeholder="QBT_TR(Filter)QBT_TR[CONTEXT=SearchEngineWidget]" autocorrect="off" autocapitalize="none" />
<span>QBT_TR(Results (showing)QBT_TR[CONTEXT=SearchEngineWidget] <span id="numSearchResultsVisible" class="numSearchResults">0</span> QBT_TR(out of)QBT_TR[CONTEXT=SearchEngineWidget] <span id="numSearchResultsTotal" class="numSearchResults">0</span>):</span>
<span>QBT_TR(Results)QBT_TR[CONTEXT=SearchEngineWidget] (QBT_TR(showing)QBT_TR[CONTEXT=SearchEngineWidget] <span id="numSearchResultsVisible" class="numSearchResults">0</span> QBT_TR(out of)QBT_TR[CONTEXT=SearchEngineWidget] <span id="numSearchResultsTotal" class="numSearchResults">0</span>):</span>
<div style="display: inline-block; float: right;">
<label for="searchInTorrentName" style="margin-left: 15px;">QBT_TR(Search in:)QBT_TR[CONTEXT=SearchEngineWidget]</label>