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

Merge pull request #736 from Gelmir/tr_drop_unneeded

Browse source 
Translations fixes
This commit is contained in:
sledgehammer999 2013-07-03 15:02:39 -07:00
commit 7b04e8204f
11 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/about.ui
View file

@ -51,7 +51,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;h3&gt;&lt;b&gt;qBittorrent&lt;/b&gt;&lt;/h3&gt;</string>
<string notr="true">&lt;h3&gt;&lt;b&gt;qBittorrent&lt;/b&gt;&lt;/h3&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@ -442,7 +442,7 @@ p, li { white-space: pre-wrap; }
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Qt:</string>
<string notr="true">Qt:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -452,7 +452,7 @@ p, li { white-space: pre-wrap; }
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Boost:</string>
<string notr="true">Boost:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -483,7 +483,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Libtorrent:</string>
<string notr="true">Libtorrent:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

2
src/about_imp.h
View file

@ -51,7 +51,7 @@ class about : public QDialog, private Ui::AboutDlg{
// Set icons
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
//Title
lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
// Thanks
QString thanks_txt;
thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");

3
src/addnewtorrentdialog.ui
View file

@ -22,9 +22,6 @@
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox">

14
src/mainwindow.cpp
View file

@ -100,7 +100,7 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
Preferences pref;
ui_locked = pref.isUILocked();
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
setWindowTitle(QString("qBittorrent %1").arg(QString::fromUtf8(VERSION)));
displaySpeedInTitle = pref.speedInTitleBar();
// Clean exit on log out
connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession()), Qt::DirectConnection);
@ -542,13 +542,13 @@ void MainWindow::createKeyboardShortcuts() {
actionCreate_torrent->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+N")));
actionOpen->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+O")));
actionExit->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Q")));
switchTransferShortcut = new QShortcut(QKeySequence(tr("Alt+1", "shortcut to switch to first tab")), this);
switchTransferShortcut = new QShortcut(QKeySequence("Alt+1"), this);
connect(switchTransferShortcut, SIGNAL(activated()), this, SLOT(displayTransferTab()));
switchSearchShortcut = new QShortcut(QKeySequence(tr("Alt+2", "shortcut to switch to third tab")), this);
switchSearchShortcut = new QShortcut(QKeySequence("Alt+2"), this);
connect(switchSearchShortcut, SIGNAL(activated()), this, SLOT(displaySearchTab()));
switchSearchShortcut2 = new QShortcut(QKeySequence(tr("Ctrl+F", "shortcut to switch to search tab")), this);
switchSearchShortcut2 = new QShortcut(QKeySequence("Ctrl+F"), this);
connect(switchSearchShortcut2, SIGNAL(activated()), this, SLOT(displaySearchTab()));
switchRSSShortcut = new QShortcut(QKeySequence(tr("Alt+3", "shortcut to switch to fourth tab")), this);
switchRSSShortcut = new QShortcut(QKeySequence("Alt+3"), this);
connect(switchRSSShortcut, SIGNAL(activated()), this, SLOT(displayRSSTab()));
actionDocumentation->setShortcut(QKeySequence("F1"));
actionOptions->setShortcut(QKeySequence(QString::fromUtf8("Alt+O")));
@ -1122,7 +1122,7 @@ void MainWindow::updateGUI() {
if (systrayIcon) {
#if defined(Q_WS_X11) || defined(Q_WS_MAC)
QString html = "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>";
html += tr("qBittorrent");
html += "qBittorrent";
html += "</div>";
html += "<div style='vertical-align: baseline; height: 18px;'>";
html += "<img src=':/Icons/skin/download.png'/>&nbsp;"+tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString::number(QBtSession::instance()->getPayloadDownloadRate()/1024., 'f', 1));
@ -1286,7 +1286,7 @@ void MainWindow::on_actionSpeed_in_title_bar_triggered() {
if (displaySpeedInTitle)
updateGUI();
else
setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
setWindowTitle(QString("qBittorrent %1").arg(QString::fromUtf8(VERSION)));
}
void MainWindow::on_actionRSS_Reader_triggered() {

2
src/mainwindow.ui
View file

@ -293,7 +293,7 @@
<string>Lock qBittorrent</string>
</property>
<property name="shortcut">
<string>Ctrl+L</string>
<string notr="true">Ctrl+L</string>
</property>
</action>
<action name="action_Import_Torrent">

2
src/properties/propertieswidget.cpp
View file

@ -653,7 +653,7 @@ void PropertiesWidget::askWebSeed() {
if (!ok) return;
qDebug("Adding %s web seed", qPrintable(url_seed));
if (!listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) {
QMessageBox::warning(this, tr("qBittorrent"),
QMessageBox::warning(this, "qBittorrent",
tr("This url seed is already in the list."),
QMessageBox::Ok);
return;

6
src/properties/trackerlist.cpp
View file

@ -66,13 +66,13 @@ TrackerList::TrackerList(PropertiesWidget *properties): QTreeWidget(), propertie
header << tr("Peers");
header << tr("Message");
setHeaderItem(new QTreeWidgetItem(header));
dht_item = new QTreeWidgetItem(QStringList() << "" << "** "+tr("[DHT]")+" **");
dht_item = new QTreeWidgetItem(QStringList() << "" << "** [DHT] **");
insertTopLevelItem(0, dht_item);
setRowColor(0, QColor("grey"));
pex_item = new QTreeWidgetItem(QStringList() << "" << "** "+tr("[PeX]")+" **");
pex_item = new QTreeWidgetItem(QStringList() << "" << "** [PeX] **");
insertTopLevelItem(1, pex_item);
setRowColor(1, QColor("grey"));
lsd_item = new QTreeWidgetItem(QStringList() << "" << "** "+tr("[LSD]")+" **");
lsd_item = new QTreeWidgetItem(QStringList() << "" << "** [LSD] **");
insertTopLevelItem(2, lsd_item);
setRowColor(2, QColor("grey"));

2
src/rss/automatedrssdownloader.ui
View file

@ -283,7 +283,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
</widget>
</item>

2
src/rss/rss_imp.cpp
View file

@ -206,7 +206,7 @@ void RSSImp::on_newFeedButton_clicked()
return;
if (m_feedList->hasFeed(newUrl)) {
QMessageBox::warning(this, tr("qBittorrent"),
QMessageBox::warning(this, "qBittorrent",
tr("This rss feed is already in the list."),
QMessageBox::Ok);
return;

2
src/searchengine/engineselectdlg.cpp
View file

@ -235,7 +235,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
qDebug("Version to be installed: %.2f", new_version);
if (!isUpdateNeeded(plugin_name, new_version)) {
qDebug("Apparently update is not needed, we have a more recent version");
QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name));
QMessageBox::information(this, tr("Search plugin install")+" -- qBittorrent", tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name));
return;
}
// Process with install

2
src/torrentimportdlg.ui
View file

@ -78,7 +78,7 @@
<item>
<widget class="QToolButton" name="browseTorrentBtn">
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
</widget>
</item>