Browse Source

String fixes and optimizations mentioned by translators on Transifex.

adaptive-webui-19844
sledgehammer999 7 years ago
parent
commit
50471ec8c8
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
  1. 3
      src/app/cmdoptions.cpp
  2. 6
      src/base/bittorrent/private/filterparserthread.cpp
  3. 8
      src/gui/addnewtorrentdialog.cpp
  4. 2
      src/gui/advancedsettings.cpp
  5. 8
      src/gui/torrentcreatordlg.cpp
  6. 2
      src/gui/torrentcreatordlg.ui

3
src/app/cmdoptions.cpp

@ -543,7 +543,8 @@ QString makeUsage(const QString &prgName)
<< 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 << PORTABLE_OPTION.usage() stream << PORTABLE_OPTION.usage()
<< wrapText(QObject::tr("Shortcut for --profile=<exe dir>/profile --relative-fastresume")) << '\n'; << wrapText(QObject::tr("Shortcut for %1", "Shortcut for --profile=<exe dir>/profile --relative-fastresume")
.arg(QLatin1String("--profile=<exe dir>/profile --relative-fastresume"))) << '\n';
stream << Option::padUsageText(QObject::tr("files or URLs")) stream << 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';

6
src/base/bittorrent/private/filterparserthread.cpp

@ -124,7 +124,7 @@ int FilterParserThread::parseDATFilterFile()
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
LogMsg(tr("I/O Error: Could not open ip filter file in read mode."), Log::CRITICAL); LogMsg(tr("I/O Error: Could not open IP filter file in read mode."), Log::CRITICAL);
return ruleCount; return ruleCount;
} }
@ -258,7 +258,7 @@ int FilterParserThread::parseP2PFilterFile()
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
LogMsg(tr("I/O Error: Could not open ip filter file in read mode."), Log::CRITICAL); LogMsg(tr("I/O Error: Could not open IP filter file in read mode."), Log::CRITICAL);
return ruleCount; return ruleCount;
} }
@ -405,7 +405,7 @@ int FilterParserThread::parseP2BFilterFile()
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
LogMsg(tr("I/O Error: Could not open ip filter file in read mode."), Log::CRITICAL); LogMsg(tr("I/O Error: Could not open IP filter file in read mode."), Log::CRITICAL);
return ruleCount; return ruleCount;
} }

8
src/gui/addnewtorrentdialog.cpp

@ -263,12 +263,12 @@ bool AddNewTorrentDialog::loadTorrent(const QString &torrentPath)
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash);
if (torrent) { if (torrent) {
if (torrent->isPrivate() || m_torrentInfo.isPrivate()) { if (torrent->isPrivate() || m_torrentInfo.isPrivate()) {
MessageBoxRaised::critical(this, tr("Already in download list"), tr("Torrent '%1' is already in download list. Trackers weren't merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok); MessageBoxRaised::critical(this, tr("Already in the download list"), tr("Torrent '%1' is already in the download list. Trackers weren't merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok);
} }
else { else {
torrent->addTrackers(m_torrentInfo.trackers()); torrent->addTrackers(m_torrentInfo.trackers());
torrent->addUrlSeeds(m_torrentInfo.urlSeeds()); torrent->addUrlSeeds(m_torrentInfo.urlSeeds());
MessageBoxRaised::information(this, tr("Already in download list"), tr("Torrent '%1' is already in download list. Trackers were merged.").arg(torrent->name()), QMessageBox::Ok); MessageBoxRaised::information(this, tr("Already in the download list"), tr("Torrent '%1' is already in the download list. Trackers were merged.").arg(torrent->name()), QMessageBox::Ok);
} }
} }
else { else {
@ -297,12 +297,12 @@ bool AddNewTorrentDialog::loadMagnet(const BitTorrent::MagnetUri &magnetUri)
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(m_hash);
if (torrent) { if (torrent) {
if (torrent->isPrivate()) { if (torrent->isPrivate()) {
MessageBoxRaised::critical(this, tr("Already in download list"), tr("Torrent '%1' is already in download list. Trackers weren't merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok); MessageBoxRaised::critical(this, tr("Already in the download list"), tr("Torrent '%1' is already in the download list. Trackers weren't merged because it is a private torrent.").arg(torrent->name()), QMessageBox::Ok);
} }
else { else {
torrent->addTrackers(magnetUri.trackers()); torrent->addTrackers(magnetUri.trackers());
torrent->addUrlSeeds(magnetUri.urlSeeds()); torrent->addUrlSeeds(magnetUri.urlSeeds());
MessageBoxRaised::information(this, tr("Already in download list"), tr("Magnet link '%1' is already in download list. Trackers were merged.").arg(torrent->name()), QMessageBox::Ok); MessageBoxRaised::information(this, tr("Already in the download list"), tr("Magnet link '%1' is already in the download list. Trackers were merged.").arg(torrent->name()), QMessageBox::Ok);
} }
} }
else { else {

2
src/gui/advancedsettings.cpp

@ -450,7 +450,7 @@ void AdvancedSettings::loadAdvancedSettings()
// Remove all tags confirmation // Remove all tags confirmation
cb_confirm_remove_all_tags.setChecked(pref->confirmRemoveAllTags()); cb_confirm_remove_all_tags.setChecked(pref->confirmRemoveAllTags());
addRow(CONFIRM_REMOVE_ALL_TAGS, tr("Confirm remove all tags"), &cb_confirm_remove_all_tags); addRow(CONFIRM_REMOVE_ALL_TAGS, tr("Confirm removal of all tags"), &cb_confirm_remove_all_tags);
// Announce to all trackers // Announce to all trackers
cb_announce_all_trackers.setChecked(session->announceToAllTrackers()); cb_announce_all_trackers.setChecked(session->announceToAllTrackers());

8
src/gui/torrentcreatordlg.cpp

@ -146,7 +146,7 @@ void TorrentCreatorDlg::onCreateButtonClicked()
// test if readable // test if readable
const QFileInfo fi(input); const QFileInfo fi(input);
if (!fi.isReadable()) { if (!fi.isReadable()) {
QMessageBox::critical(this, tr("Torrent creator failed"), tr("Reason: Path to file/folder is not readable.")); QMessageBox::critical(this, tr("Torrent creation failed"), tr("Reason: Path to file/folder is not readable."));
return; return;
} }
input = fi.canonicalFilePath(); input = fi.canonicalFilePath();
@ -176,7 +176,7 @@ void TorrentCreatorDlg::handleCreationFailure(const QString &msg)
{ {
// Remove busy cursor // Remove busy cursor
setCursor(QCursor(Qt::ArrowCursor)); setCursor(QCursor(Qt::ArrowCursor));
QMessageBox::information(this, tr("Torrent creator failed"), tr("Reason: %1").arg(msg)); QMessageBox::information(this, tr("Torrent creation failed"), tr("Reason: %1").arg(msg));
setInteractionEnabled(true); setInteractionEnabled(true);
} }
@ -188,7 +188,7 @@ void TorrentCreatorDlg::handleCreationSuccess(const QString &path, const QString
// Create save path temp data // Create save path temp data
BitTorrent::TorrentInfo t = BitTorrent::TorrentInfo::loadFromFile(Utils::Fs::toNativePath(path)); BitTorrent::TorrentInfo t = BitTorrent::TorrentInfo::loadFromFile(Utils::Fs::toNativePath(path));
if (!t.isValid()) { if (!t.isValid()) {
QMessageBox::critical(this, tr("Torrent creator failed"), tr("Reason: Created torrent is invalid. It won't be added to download list.")); QMessageBox::critical(this, tr("Torrent creation failed"), tr("Reason: Created torrent is invalid. It won't be added to download list."));
return; return;
} }
@ -199,7 +199,7 @@ void TorrentCreatorDlg::handleCreationSuccess(const QString &path, const QString
BitTorrent::Session::instance()->addTorrent(t, params); BitTorrent::Session::instance()->addTorrent(t, params);
} }
QMessageBox::information(this, tr("Torrent creator"), QString("%1\n%2").arg(tr("Create torrent success:")).arg(Utils::Fs::toNativePath(path))); QMessageBox::information(this, tr("Torrent creator"), QString("%1\n%2").arg(tr("Torrent created:")).arg(Utils::Fs::toNativePath(path)));
setInteractionEnabled(true); setInteractionEnabled(true);
} }

2
src/gui/torrentcreatordlg.ui

@ -169,7 +169,7 @@
<item> <item>
<widget class="QPushButton" name="buttonCalcTotalPieces"> <widget class="QPushButton" name="buttonCalcTotalPieces">
<property name="text"> <property name="text">
<string>Calculate total pieces:</string> <string>Calculate number of pieces:</string>
</property> </property>
</widget> </widget>
</item> </item>

Loading…
Cancel
Save