Merge pull request #15459 from Chocobo1/i18n

Revise description wordings
This commit is contained in:
Chocobo1
2021-09-19 13:29:08 +08:00
committed by GitHub
15 changed files with 66 additions and 95 deletions

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>

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>

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

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

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

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>

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>