diff --git a/src/httpconnection.cpp b/src/httpconnection.cpp
index 1f23338f0..f9bcfb57e 100644
--- a/src/httpconnection.cpp
+++ b/src/httpconnection.cpp
@@ -340,17 +340,17 @@ void HttpConnection::respondCommand(QString command)
BTSession->enableDHT(dht_state == 1);
Preferences::setDHTEnabled(dht_state == 1);
}
- int mac_connec = parser.post("mac_connec").toInt(&ok);
+ int max_connec = parser.post("max_connec").toInt(&ok);
if(ok) {
- BTSession->setMaxConnections(mac_connec);
- Preferences::setMaxConnecs(mac_connec);
+ BTSession->setMaxConnections(max_connec);
+ Preferences::setMaxConnecs(max_connec);
}
- int max_connec_per_torrent = parser.post("mac_connec_per_torrent").toInt(&ok);
+ int max_connec_per_torrent = parser.post("max_connec_per_torrent").toInt(&ok);
if(ok) {
BTSession->setMaxConnectionsPerTorrent(max_connec_per_torrent);
Preferences::setMaxConnecsPerTorrent(max_connec_per_torrent);
}
- int max_uploads_per_torrent = parser.post("mac_uploads_per_torrent").toInt(&ok);
+ int max_uploads_per_torrent = parser.post("max_uploads_per_torrent").toInt(&ok);
if(ok) {
BTSession->setMaxUploadsPerTorrent(max_uploads_per_torrent);
Preferences::setMaxUploadsPerTorrent(max_uploads_per_torrent);
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 9892a1a0a..836a985e7 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -68,6 +68,12 @@ HttpServer::HttpServer(Bittorrent *_BTSession, int msec, QObject* parent) : QTcp
a = tr("Point to torrent file");
a = tr("Download");
a = tr("Are you sure you want to delete the selected torrents from the transfer list and hard disk?");
+ a = tr("Download rate limit must be greater than 0 or disabled.");
+ a = tr("Upload rate limit must be greater than 0 or disabled.");
+ a = tr("Maximum number of connections limit must be greater than 0 or disabled.");
+ a = tr("Maximum number of connections per torrent limit must be greater than 0 or disabled.");
+ a = tr("Maximum number of upload slots per torrent limit must be greater than 0 or disabled.");
+ a = tr("Unable to save program preferences, qBittorrent is probably unreachable.");
}
HttpServer::~HttpServer()
diff --git a/src/lang/qbittorrent_bg.ts b/src/lang/qbittorrent_bg.ts
index e42fe8288..4e5598801 100644
--- a/src/lang/qbittorrent_bg.ts
+++ b/src/lang/qbittorrent_bg.ts
@@ -1521,25 +1521,25 @@ Copyright © 2006 от Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1563,33 +1563,33 @@ Copyright © 2006 от Christophe Dumez<br>
Максимален
-
-
+
+
-
-
+
+
/second (i.e. per second)
/с
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2911,6 +2911,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ca.ts b/src/lang/qbittorrent_ca.ts
index f6bbd50da..8d3a08db8 100644
--- a/src/lang/qbittorrent_ca.ts
+++ b/src/lang/qbittorrent_ca.ts
@@ -1273,56 +1273,56 @@ p, li { white-space: pre-wrap; }
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
/second (i.e. per second)
/s
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2368,6 +2368,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_cs.ts b/src/lang/qbittorrent_cs.ts
index c74702fdf..cb321306e 100644
--- a/src/lang/qbittorrent_cs.ts
+++ b/src/lang/qbittorrent_cs.ts
@@ -1128,25 +1128,25 @@ Copyright © 2006 by Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1170,33 +1170,33 @@ Copyright © 2006 by Christophe Dumez<br>
Maximální
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -1976,6 +1976,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_da.ts b/src/lang/qbittorrent_da.ts
index 7e2d7e9e1..077f0a615 100644
--- a/src/lang/qbittorrent_da.ts
+++ b/src/lang/qbittorrent_da.ts
@@ -1178,56 +1178,56 @@ Copyright © 2006 by Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2095,6 +2095,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_de.ts b/src/lang/qbittorrent_de.ts
index 97b5a4815..a5fe37efa 100644
--- a/src/lang/qbittorrent_de.ts
+++ b/src/lang/qbittorrent_de.ts
@@ -1451,25 +1451,25 @@ qBittorrent beobachtet das Verzeichniss und starten den Download von vorhandenen
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1493,33 +1493,33 @@ qBittorrent beobachtet das Verzeichniss und starten den Download von vorhandenen
Maximum
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2878,6 +2878,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_el.ts b/src/lang/qbittorrent_el.ts
index 7f1d6504a..85244ce4b 100644
--- a/src/lang/qbittorrent_el.ts
+++ b/src/lang/qbittorrent_el.ts
@@ -1544,56 +1544,56 @@ Copyright © 2006 από τον Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
/second (i.e. per second)
/s
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2961,6 +2961,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_en.ts b/src/lang/qbittorrent_en.ts
index 76b7f0337..e2b684a2e 100644
--- a/src/lang/qbittorrent_en.ts
+++ b/src/lang/qbittorrent_en.ts
@@ -860,56 +860,56 @@ p, li { white-space: pre-wrap; }
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -1410,6 +1410,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_es.ts b/src/lang/qbittorrent_es.ts
index 822415c1f..afed34d99 100644
--- a/src/lang/qbittorrent_es.ts
+++ b/src/lang/qbittorrent_es.ts
@@ -1440,25 +1440,25 @@ p, li { white-space: pre-wrap; }
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1482,33 +1482,33 @@ p, li { white-space: pre-wrap; }
Máxima
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2821,6 +2821,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_fi.ts b/src/lang/qbittorrent_fi.ts
index 797d40058..4160f9009 100644
--- a/src/lang/qbittorrent_fi.ts
+++ b/src/lang/qbittorrent_fi.ts
@@ -1325,25 +1325,25 @@ p, li { white-space: pre-wrap; }
EventManager
-
-
+
+
Työstetään
-
+
Päivitetään...
-
-
+
+
Ei toimi
-
-
+
+
Ei ole vielä yheyttä
@@ -1367,33 +1367,33 @@ p, li { white-space: pre-wrap; }
Korkein
-
-
+
+
tämä istunto
-
-
+
+
/second (i.e. per second)
/s
-
+
e.g. Seeded for 3m10s
jaettu %1
-
+
e.g. 10 max
korkeintaan %1
-
-
+
+
e.g. 120 KiB/s
%1/s
@@ -2562,6 +2562,36 @@ Haluatko varmasti lopettaa qBittorrentin?
Haluatko poistaa valitut torrentit siirtolistalta ja kovalevyltä?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_fr.ts b/src/lang/qbittorrent_fr.ts
index 6f3a40d4a..7c20c7e6b 100644
--- a/src/lang/qbittorrent_fr.ts
+++ b/src/lang/qbittorrent_fr.ts
@@ -1564,25 +1564,25 @@ Copyright © 2006 par Christophe DUMEZ<br>
EventManager
-
-
+
+
Fonctionne
-
+
Mise à jour...
-
-
+
+
Indisponible
-
-
+
+
Pas encore contacté
@@ -1606,33 +1606,33 @@ Copyright © 2006 par Christophe DUMEZ<br>
Maximale
-
-
+
+
cette session
-
-
+
+
/second (i.e. per second)
/s
-
+
e.g. Seeded for 3m10s
Complet depuis %1
-
+
e.g. 10 max
%1 max
-
-
+
+
e.g. 120 KiB/s
%1/s
@@ -3056,6 +3056,36 @@ Etes-vous certain de vouloir quitter qBittorrent ?
Etes-vous certain de vouloir supprimer les torrents sélectionnés de la liste et du disque dur ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_hu.ts b/src/lang/qbittorrent_hu.ts
index 94bb10f45..5750357c9 100644
--- a/src/lang/qbittorrent_hu.ts
+++ b/src/lang/qbittorrent_hu.ts
@@ -1368,25 +1368,25 @@ Copyright © 2006 by Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1410,33 +1410,33 @@ Copyright © 2006 by Christophe Dumez<br>
Maximális
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2406,6 +2406,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_it.ts b/src/lang/qbittorrent_it.ts
index 577f9675d..dd3c79fa8 100644
--- a/src/lang/qbittorrent_it.ts
+++ b/src/lang/qbittorrent_it.ts
@@ -1424,25 +1424,25 @@ Copyright © 2006 by Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1466,33 +1466,33 @@ Copyright © 2006 by Christophe Dumez<br>
Massima
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2733,6 +2733,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ja.ts b/src/lang/qbittorrent_ja.ts
index 95b285559..a239eac2e 100644
--- a/src/lang/qbittorrent_ja.ts
+++ b/src/lang/qbittorrent_ja.ts
@@ -1340,25 +1340,25 @@ Copyright © 2006 by Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1382,33 +1382,33 @@ Copyright © 2006 by Christophe Dumez<br>
最大
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2336,6 +2336,36 @@ qBittorrent を終了してもよろしいですか?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ko.ts b/src/lang/qbittorrent_ko.ts
index 7bfd25164..b0cf31330 100644
--- a/src/lang/qbittorrent_ko.ts
+++ b/src/lang/qbittorrent_ko.ts
@@ -1479,25 +1479,25 @@ list:
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -1521,33 +1521,33 @@ list:
최고
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2903,6 +2903,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_nb.ts b/src/lang/qbittorrent_nb.ts
index 9e0a09dc6..466cf629d 100644
--- a/src/lang/qbittorrent_nb.ts
+++ b/src/lang/qbittorrent_nb.ts
@@ -1200,56 +1200,56 @@ Copyright © 2006 av Christophe Dumez<br>
EventManager
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
/second (i.e. per second)
-
+
e.g. Seeded for 3m10s
-
+
e.g. 10 max
-
-
+
+
e.g. 120 KiB/s
@@ -2297,6 +2297,36 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_nl.ts b/src/lang/qbittorrent_nl.ts
index 6d858e533..d947eddb7 100644
--- a/src/lang/qbittorrent_nl.ts
+++ b/src/lang/qbittorrent_nl.ts
@@ -2562,6 +2562,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pl.ts b/src/lang/qbittorrent_pl.ts
index 55b58861c..76bed3d8c 100644
--- a/src/lang/qbittorrent_pl.ts
+++ b/src/lang/qbittorrent_pl.ts
@@ -2584,6 +2584,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pt.ts b/src/lang/qbittorrent_pt.ts
index e06c8f08a..85fb1e00e 100644
--- a/src/lang/qbittorrent_pt.ts
+++ b/src/lang/qbittorrent_pt.ts
@@ -2481,6 +2481,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pt_BR.ts b/src/lang/qbittorrent_pt_BR.ts
index e06c8f08a..85fb1e00e 100644
--- a/src/lang/qbittorrent_pt_BR.ts
+++ b/src/lang/qbittorrent_pt_BR.ts
@@ -2481,6 +2481,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ro.ts b/src/lang/qbittorrent_ro.ts
index ca6b868f7..141936b28 100644
--- a/src/lang/qbittorrent_ro.ts
+++ b/src/lang/qbittorrent_ro.ts
@@ -2408,6 +2408,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ru.ts b/src/lang/qbittorrent_ru.ts
index bf791105a..d561f06b8 100644
--- a/src/lang/qbittorrent_ru.ts
+++ b/src/lang/qbittorrent_ru.ts
@@ -2570,6 +2570,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_sk.ts b/src/lang/qbittorrent_sk.ts
index 08125be37..a18cf09d8 100644
--- a/src/lang/qbittorrent_sk.ts
+++ b/src/lang/qbittorrent_sk.ts
@@ -2500,6 +2500,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_sv.ts b/src/lang/qbittorrent_sv.ts
index e85efea25..9d7268965 100644
--- a/src/lang/qbittorrent_sv.ts
+++ b/src/lang/qbittorrent_sv.ts
@@ -1554,6 +1554,30 @@ Are you sure you want to quit qBittorrent?
Är du säker på att du vill ta bort de markerade torrent-filerna från överföringslistan och hårddisken?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_tr.ts b/src/lang/qbittorrent_tr.ts
index 1fd5a4bd2..2b428255f 100644
--- a/src/lang/qbittorrent_tr.ts
+++ b/src/lang/qbittorrent_tr.ts
@@ -2555,6 +2555,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_uk.ts b/src/lang/qbittorrent_uk.ts
index cbf910b55..39466d66b 100644
--- a/src/lang/qbittorrent_uk.ts
+++ b/src/lang/qbittorrent_uk.ts
@@ -2429,6 +2429,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_zh.ts b/src/lang/qbittorrent_zh.ts
index e9fc5ec82..8bd0578d4 100644
--- a/src/lang/qbittorrent_zh.ts
+++ b/src/lang/qbittorrent_zh.ts
@@ -2699,6 +2699,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_zh_TW.ts b/src/lang/qbittorrent_zh_TW.ts
index 5c7a55cae..fb8103961 100644
--- a/src/lang/qbittorrent_zh_TW.ts
+++ b/src/lang/qbittorrent_zh_TW.ts
@@ -1648,6 +1648,30 @@ Are you sure you want to quit qBittorrent?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/ui/options.ui b/src/ui/options.ui
index 4f3f83bbb..9989304b2 100644
--- a/src/ui/options.ui
+++ b/src/ui/options.ui
@@ -2304,8 +2304,8 @@
0
0
- 620
- 488
+ 226
+ 123
@@ -2401,8 +2401,8 @@
0
0
- 620
- 488
+ 218
+ 220
@@ -2565,8 +2565,8 @@
0
0
- 620
- 488
+ 451
+ 195
diff --git a/src/webui/preferences.html b/src/webui/preferences.html
index 7f753c51d..c9acd6749 100644
--- a/src/webui/preferences.html
+++ b/src/webui/preferences.html
@@ -55,9 +55,68 @@