Merge pull request #4739 from sledgehammer999/web_translations

Don't duplicate translatable strings for the WebUI. Use the ones from…
This commit is contained in:
sledgehammer999
2017-05-07 16:24:53 +03:00
committed by GitHub
30 changed files with 417 additions and 459 deletions

View File

@@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Deletion confirmation - qBittorrent</string>
<string>Deletion confirmation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Download from urls</string>
<string>Download from URLs</string>
</property>
<layout class="QVBoxLayout">
<item>
@@ -33,12 +33,12 @@
</item>
<item>
<widget class="QTextEdit" name="textUrls">
<property name="acceptRichText">
<bool>false</bool>
</property>
<property name="tabChangesFocus">
<bool>true</bool>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
</widget>
</item>
<item>

View File

@@ -1021,7 +1021,8 @@ void MainWindow::closeEvent(QCloseEvent *e)
if (!isVisible())
show();
QMessageBox confirmBox(QMessageBox::Question, tr("Exiting qBittorrent"),
tr("Some files are currently transferring.\nAre you sure you want to quit qBittorrent?"),
// Split it because the last sentence is used in the Web UI
tr("Some files are currently transferring.") + "\n" + tr("Are you sure you want to quit qBittorrent?"),
QMessageBox::NoButton, this);
QPushButton *noBtn = confirmBox.addButton(tr("&No"), QMessageBox::NoRole);
confirmBox.addButton(tr("&Yes"), QMessageBox::YesRole);

View File

@@ -679,7 +679,7 @@
<x>0</x>
<y>0</y>
<width>470</width>
<height>994</height>
<height>1017</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -714,7 +714,7 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<item>
<widget class="QCheckBox" name="checkCreateSubfolder">
<property name="text">
<string>Create subfolder for torrents with multiple files</string>
@@ -2754,7 +2754,7 @@
<item>
<widget class="QGroupBox" name="checkWebUi">
<property name="title">
<string>Enable Web User Interface (Remote control)</string>
<string>Web User Interface (Remote control)</string>
</property>
<property name="checkable">
<bool>true</bool>