Browse Source

Merge pull request #15459 from Chocobo1/i18n

Revise description wordings
adaptive-webui-19844
Chocobo1 3 years ago committed by GitHub
parent
commit
ecd23d0abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/app/application.cpp
  2. 84
      src/app/cmdoptions.cpp
  3. 2
      src/base/bittorrent/session.cpp
  4. 4
      src/base/net/dnsupdater.cpp
  5. 2
      src/gui/aboutdialog.ui
  6. 2
      src/gui/addnewtorrentdialog.ui
  7. 2
      src/gui/advancedsettings.cpp
  8. 8
      src/gui/mainwindow.cpp
  9. 2
      src/gui/mainwindow.ui
  10. 2
      src/gui/optionsdialog.ui
  11. 4
      src/gui/rss/automatedrssdownloader.ui
  12. 39
      src/webui/www/private/views/about.html
  13. 2
      src/webui/www/private/views/aboutToolbar.html
  14. 2
      src/webui/www/private/views/preferences.html
  15. 2
      src/webui/www/private/views/search.html

4
src/app/application.cpp

@ -665,8 +665,8 @@ int Application::exec(const QStringList &params)
if (pref->getWebUIPassword() == "ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtHAjU9b3b7uB8NR1Gur2hmQCvCDpm39Q+PsJRJPaCU51dEiz+dTzh8qbPsL8WkFljQYFQ==") if (pref->getWebUIPassword() == "ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtHAjU9b3b7uB8NR1Gur2hmQCvCDpm39Q+PsJRJPaCU51dEiz+dTzh8qbPsL8WkFljQYFQ==")
{ {
const QString warning = tr("The Web UI administrator username is: %1").arg(pref->getWebUiUsername()) + '\n' 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("The Web UI administrator password has not been changed from the default: %1").arg("adminadmin") + '\n'
+ tr("This is a security risk, please consider changing your password from program preferences.") + '\n'; + tr("This is a security risk, please change your password in program preferences.") + '\n';
printf("%s", qUtf8Printable(warning)); printf("%s", qUtf8Printable(warning));
} }
#endif // DISABLE_WEBUI #endif // DISABLE_WEBUI

84
src/app/cmdoptions.cpp

@ -526,55 +526,55 @@ QString makeUsage(const QString &prgName)
QTextStream stream(&text, QIODevice::WriteOnly); QTextStream stream(&text, QIODevice::WriteOnly);
QString indentation = QString(USAGE_INDENTATION, ' '); QString indentation = QString(USAGE_INDENTATION, ' ');
stream << QObject::tr("Usage:") << '\n'; stream << QObject::tr("Usage:") << '\n'
stream << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n'; << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n'
stream << QObject::tr("Options:") << '\n'; << QObject::tr("Options:") << '\n'
#if !defined(Q_OS_WIN) || defined(DISABLE_GUI) #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 #endif
stream << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n'; << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n'
stream << WEBUI_PORT_OPTION.usage(QObject::tr("port")) << WEBUI_PORT_OPTION.usage(QObject::tr("port"))
<< wrapText(QObject::tr("Change the Web UI port")) << wrapText(QObject::tr("Change the Web UI port"))
<< '\n'; << '\n'
#ifndef DISABLE_GUI #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) #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 #endif
//: Use appropriate short form or abbreviation of "directory" //: Use appropriate short form or abbreviation of "directory"
stream << PROFILE_OPTION.usage(QObject::tr("dir")) << PROFILE_OPTION.usage(QObject::tr("dir"))
<< wrapText(QObject::tr("Store configuration files in <dir>")) << '\n'; << wrapText(QObject::tr("Store configuration files in <dir>")) << '\n'
stream << CONFIGURATION_OPTION.usage(QObject::tr("name")) << CONFIGURATION_OPTION.usage(QObject::tr("name"))
<< wrapText(QObject::tr("Store configuration files in directories qBittorrent_<name>")) << '\n'; << wrapText(QObject::tr("Store configuration files in directories qBittorrent_<name>")) << '\n'
stream << RELATIVE_FASTRESUME.usage() << RELATIVE_FASTRESUME.usage()
<< wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative " << wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative "
"to the profile directory")) << '\n'; "to the profile directory")) << '\n'
stream << Option::padUsageText(QObject::tr("files or URLs")) << Option::padUsageText(QObject::tr("files or URLs"))
<< wrapText(QObject::tr("Download the torrents passed by the user")) << '\n' << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n'
<< '\n'; << '\n'
stream << wrapText(QObject::tr("Options when adding new torrents:"), 0) << '\n'; << 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'; << 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'; << 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'; << SKIP_HASH_CHECK_OPTION.usage() << wrapText(QObject::tr("Skip hash check")) << '\n'
stream << CATEGORY_OPTION.usage(QObject::tr("name")) << CATEGORY_OPTION.usage(QObject::tr("name"))
<< wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be " << wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be "
"created.")) << '\n'; "created.")) << '\n'
stream << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n'; << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n'
stream << FIRST_AND_LAST_OPTION.usage() << FIRST_AND_LAST_OPTION.usage()
<< wrapText(QObject::tr("Download first and last pieces first")) << '\n'; << wrapText(QObject::tr("Download first and last pieces first")) << '\n'
stream << SKIP_DIALOG_OPTION.usage() << SKIP_DIALOG_OPTION.usage()
<< wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a " << wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a "
"torrent.")) << '\n'; "torrent.")) << '\n'
stream << '\n'; << '\n'
stream << wrapText(QObject::tr("Option values may be supplied via environment variables. For option named " << 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 " "'parameter-name', environment variable name is 'QBT_PARAMETER_NAME' (in upper "
"case, '-' replaced with '_'). To pass flag values, set the variable to '1' or " "case, '-' replaced with '_'). To pass flag values, set the variable to '1' or "
"'TRUE'. For example, to disable the splash screen: "), 0) << "\n" "'TRUE'. For example, to disable the splash screen: "), 0) << "\n"
<< QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n' << QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n'
<< wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n'; << wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n';
return text; return text;
} }

2
src/base/bittorrent/session.cpp

@ -2929,7 +2929,7 @@ void Session::setBannedIPs(const QStringList &newList)
} }
else 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) .arg(ip)
, Log::WARNING); , Log::WARNING);
} }

4
src/base/net/dnsupdater.cpp

@ -213,7 +213,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
if (code == "badagent") 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); Log::CRITICAL);
m_state = FATAL; m_state = FATAL;
return; return;
@ -221,7 +221,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
if (code == "!donator") 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); Log::CRITICAL);
m_state = FATAL; m_state = FATAL;
return; return;

2
src/gui/aboutdialog.ui

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

2
src/gui/addnewtorrentdialog.ui

@ -138,7 +138,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="doNotDeleteTorrentCheckBox"> <widget class="QCheckBox" name="doNotDeleteTorrentCheckBox">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Do not delete .torrent file</string> <string>Do not delete .torrent file</string>

2
src/gui/advancedsettings.cpp

@ -654,7 +654,7 @@ void AdvancedSettings::loadAdvancedSettings()
addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP address to bind to"), &m_comboBoxInterfaceAddress); addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP address to bind to"), &m_comboBoxInterfaceAddress);
// Announce IP // Announce IP
m_lineEditAnnounceIP.setText(session->announceIP()); 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", "(?)")) + ' ' + makeLink("https://www.libtorrent.org/reference-Settings.html#announce_ip", "(?)"))
, &m_lineEditAnnounceIP); , &m_lineEditAnnounceIP);
// Max concurrent HTTP announces // Max concurrent HTTP announces

8
src/gui/mainwindow.cpp

@ -461,7 +461,7 @@ MainWindow::MainWindow(QWidget *parent)
if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet())) if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet()))
{ {
if (QMessageBox::question(this, tr("Torrent file association"), 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) QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes)
{ {
Preferences::setTorrentFileAssoc(true); Preferences::setTorrentFileAssoc(true);
@ -650,7 +650,7 @@ bool MainWindow::defineUILockPassword()
if (newPassword.size() < 3) 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; return false;
} }
@ -871,7 +871,7 @@ void MainWindow::torrentNew(BitTorrent::Torrent *const torrent) const
// called when a torrent has finished // called when a torrent has finished
void MainWindow::finishedTorrent(BitTorrent::Torrent *const torrent) const 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 // Notification when disk is full
@ -1469,6 +1469,7 @@ void MainWindow::activate()
void MainWindow::optionsSaved() void MainWindow::optionsSaved()
{ {
Logger::instance()->addMessage(tr("Options saved."));
loadPreferences(); loadPreferences();
} }
@ -1491,7 +1492,6 @@ void MainWindow::showStatusBar(bool show)
void MainWindow::loadPreferences(const bool configureSession) void MainWindow::loadPreferences(const bool configureSession)
{ {
Logger::instance()->addMessage(tr("Options were saved successfully."));
const Preferences *const pref = Preferences::instance(); const Preferences *const pref = Preferences::instance();
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
Q_UNUSED(configureSession); Q_UNUSED(configureSession);

2
src/gui/mainwindow.ui

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

2
src/gui/optionsdialog.ui

@ -827,7 +827,7 @@
<item> <item>
<widget class="QGroupBox" name="deleteTorrentBox"> <widget class="QGroupBox" name="deleteTorrentBox">
<property name="toolTip"> <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>
<property name="title"> <property name="title">
<string>De&amp;lete .torrent files afterwards </string> <string>De&amp;lete .torrent files afterwards </string>

4
src/gui/rss/automatedrssdownloader.ui

@ -25,7 +25,7 @@
<string notr="true">color: red;</string> <string notr="true">color: red;</string>
</property> </property>
<property name="text"> <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>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -221,7 +221,7 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="addCategoryBtn" /> <widget class="QToolButton" name="addCategoryBtn"/>
</item> </item>
</layout> </layout>
</item> </item>

39
src/webui/www/private/views/about.html

@ -26,48 +26,19 @@
</tr> </tr>
</table> </table>
</br> </br>
<h3>QBT_TR(Original authors)QBT_TR[CONTEXT=HttpServer]</h3> <h3>QBT_TR(Original author)QBT_TR[CONTEXT=HttpServer]</h3>
<table> <table>
<tr> <tr>
<td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td> <td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
<td>Ishan Arora</td> <td>Christophe Dumez</td>
</tr> </tr>
<tr> <tr>
<td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td> <td>QBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a target="_blank" href="mailto:ishanarora@gmail.com">ishanarora@gmail.com</a></td> <td>QBT_TR(France)QBT_TR[CONTEXT=AboutDialog]</td>
</tr>
</table>
</br>
<table>
<tr>
<td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
<td>Ankit Gupta</td>
</tr>
<tr>
<td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a target="_blank" href="mailto:ank.iitd@gmail.com">ank.iitd@gmail.com</a></td>
</tr>
</table>
</br>
<table>
<tr>
<td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
<td>Chandan Shikhar Dua</td>
</tr>
<tr>
<td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a target="_blank" href="mailto:shikhar.ap@gmail.com">shikhar.ap@gmail.com</a></td>
</tr>
</table>
</br>
<table>
<tr>
<td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
<td>Swapnil Kumar</td>
</tr> </tr>
<tr> <tr>
<td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td> <td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a target="_blank" href="mailto:swapnil.iitd@gmail.com">swapnil.iitd@gmail.com</a></td> <td><a target="_blank" href="mailto:chris@qbittorrent.org">chris@qbittorrent.org</a></td>
</tr> </tr>
</table> </table>
</div> </div>

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

@ -1,7 +1,7 @@
<div class="toolbarTabs"> <div class="toolbarTabs">
<ul id="aboutTabs" class="tab-menu"> <ul id="aboutTabs" class="tab-menu">
<li id="aboutAboutLink" class="selected"><a>QBT_TR(About)QBT_TR[CONTEXT=AboutDialog]</a></li> <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="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="aboutTranslatorsLink"><a>QBT_TR(Translators)QBT_TR[CONTEXT=AboutDialog]</a></li>
<li id="aboutLicenseLink"><a>QBT_TR(License)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

@ -1208,7 +1208,7 @@
</tr> </tr>
<tr> <tr>
<td> <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>
<td> <td>
<input type="text" id="announceIP" style="width: 15em;" /> <input type="text" id="announceIP" style="width: 15em;" />

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

@ -103,7 +103,7 @@
<div id="searchResultsFilters"> <div id="searchResultsFilters">
<input type="text" id="searchInNameFilter" placeholder="QBT_TR(Filter)QBT_TR[CONTEXT=SearchEngineWidget]" autocorrect="off" autocapitalize="none" /> <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;"> <div style="display: inline-block; float: right;">
<label for="searchInTorrentName" style="margin-left: 15px;">QBT_TR(Search in:)QBT_TR[CONTEXT=SearchEngineWidget]</label> <label for="searchInTorrentName" style="margin-left: 15px;">QBT_TR(Search in:)QBT_TR[CONTEXT=SearchEngineWidget]</label>

Loading…
Cancel
Save