- Can have different proxy settings for bittorrent and search engine (closes #274791)

This commit is contained in:
Christophe Dumez 2008-09-27 09:12:41 +00:00
commit 139360cf76
60 changed files with 3322 additions and 2683 deletions

View file

@ -169,37 +169,32 @@ Copyright © 2006 by Christophe Dumez<br>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1611"/>
<location filename="../options.ui" line="1834"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="911"/>
<source>Proxy Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1912"/>
<location filename="../options.ui" line="2135"/>
<source>Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1951"/>
<location filename="../options.ui" line="2174"/>
<source>Authentication</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1972"/>
<location filename="../options.ui" line="2195"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1579"/>
<location filename="../options.ui" line="1802"/>
<source>Activate IP Filtering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1573"/>
<location filename="../options.ui" line="1796"/>
<source>Filter Settings</source>
<translation type="unfinished"></translation>
</message>
@ -209,7 +204,7 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="890"/>
<location filename="../options.ui" line="894"/>
<source>KiB/s</source>
<translation type="unfinished"></translation>
</message>
@ -234,52 +229,52 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="932"/>
<location filename="../options.ui" line="1530"/>
<source>HTTP</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="937"/>
<location filename="../options.ui" line="1535"/>
<source>SOCKS5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1109"/>
<location filename="../options.ui" line="1707"/>
<source>Affected connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1121"/>
<location filename="../options.ui" line="1719"/>
<source>Use proxy for connections to trackers</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1137"/>
<location filename="../options.ui" line="1735"/>
<source>Use proxy for connections to regular peers</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1169"/>
<location filename="../options.ui" line="1767"/>
<source>Use proxy for connections to web seeds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1153"/>
<location filename="../options.ui" line="1751"/>
<source>Use proxy for DHT messages</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1394"/>
<location filename="../options.ui" line="1143"/>
<source>Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1399"/>
<location filename="../options.ui" line="1148"/>
<source>Forced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1404"/>
<location filename="../options.ui" line="1153"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@ -413,102 +408,102 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="784"/>
<location filename="../options.ui" line="788"/>
<source>Global bandwidth limiting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="800"/>
<location filename="../options.ui" line="804"/>
<source>Upload:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="816"/>
<location filename="../options.ui" line="820"/>
<source>Download:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="919"/>
<location filename="../options.ui" line="1517"/>
<source>Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="927"/>
<location filename="../options.ui" line="1525"/>
<source>(None)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="948"/>
<location filename="../options.ui" line="1546"/>
<source>Proxy:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1962"/>
<location filename="../options.ui" line="2185"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1188"/>
<location filename="../options.ui" line="937"/>
<source>Bittorrent</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1197"/>
<location filename="../options.ui" line="946"/>
<source>Connections limit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1205"/>
<location filename="../options.ui" line="954"/>
<source>Global maximum number of connections:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1253"/>
<location filename="../options.ui" line="1002"/>
<source>Maximum number of connections per torrent:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1298"/>
<location filename="../options.ui" line="1047"/>
<source>Maximum number of upload slots per torrent:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1341"/>
<location filename="../options.ui" line="1090"/>
<source>Additional Bittorrent features</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1347"/>
<location filename="../options.ui" line="1096"/>
<source>Enable DHT network (decentralized)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1357"/>
<location filename="../options.ui" line="1106"/>
<source>Enable Peer eXchange (PeX)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1367"/>
<location filename="../options.ui" line="1116"/>
<source>Enable Local Peer Discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1386"/>
<location filename="../options.ui" line="1135"/>
<source>Encryption:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1430"/>
<location filename="../options.ui" line="1179"/>
<source>Share ratio settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1438"/>
<location filename="../options.ui" line="1187"/>
<source>Desired ratio:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1594"/>
<location filename="../options.ui" line="1817"/>
<source>Filter file path:</source>
<translation type="unfinished"></translation>
</message>
@ -523,27 +518,27 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1561"/>
<location filename="../options.ui" line="1784"/>
<source>Misc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1623"/>
<location filename="../options.ui" line="1846"/>
<source>RSS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1676"/>
<location filename="../options.ui" line="1899"/>
<source>RSS feeds refresh interval:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1696"/>
<location filename="../options.ui" line="1919"/>
<source>minutes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1720"/>
<location filename="../options.ui" line="1943"/>
<source>Maximum number of articles per feed:</source>
<translation type="unfinished"></translation>
</message>
@ -553,7 +548,7 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1492"/>
<location filename="../options.ui" line="1241"/>
<source>Remove finished torrents when their ratio reaches:</source>
<translation type="unfinished"></translation>
</message>
@ -609,52 +604,52 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1377"/>
<location filename="../options.ui" line="1126"/>
<source>Spoof Azureus to avoid ban (requires restart)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1878"/>
<location filename="../options.ui" line="2101"/>
<source>Web UI</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1890"/>
<location filename="../options.ui" line="2113"/>
<source>Enable Web User Interface</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1903"/>
<location filename="../options.ui" line="2126"/>
<source>HTTP Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1629"/>
<location filename="../options.ui" line="1852"/>
<source>Enable RSS support</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1639"/>
<location filename="../options.ui" line="1862"/>
<source>RSS settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1768"/>
<location filename="../options.ui" line="1991"/>
<source>Enable queueing system</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1780"/>
<location filename="../options.ui" line="2003"/>
<source>Maximum active downloads:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1762"/>
<location filename="../options.ui" line="1985"/>
<source>Torrent queueing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1823"/>
<location filename="../options.ui" line="2046"/>
<source>Maximum active torrents:</source>
<translation type="unfinished"></translation>
</message>
@ -663,6 +658,21 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<source>Display top toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1310"/>
<source>Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1319"/>
<source>Search engine proxy settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options.ui" line="1509"/>
<source>Bittorrent proxy settings</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DownloadingTorrents</name>
@ -853,23 +863,23 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1441"/>
<location filename="../GUI.cpp" line="1446"/>
<source>Connection status:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1424"/>
<location filename="../GUI.cpp" line="1429"/>
<source>qBittorrent</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1427"/>
<location filename="../GUI.cpp" line="1432"/>
<source>DL speed: %1 KiB/s</source>
<comment>e.g: Download speed: 10 KiB/s</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1430"/>
<location filename="../GUI.cpp" line="1435"/>
<source>UP speed: %1 KiB/s</source>
<comment>e.g: Upload speed: 10 KiB/s</comment>
<translation type="unfinished"></translation>
@ -898,12 +908,12 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1438"/>
<location filename="../GUI.cpp" line="1443"/>
<source>Connection Status:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1438"/>
<location filename="../GUI.cpp" line="1443"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
@ -930,22 +940,22 @@ Copyright © 2006 by Christophe Dumez&lt;br&gt;
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1034"/>
<location filename="../GUI.cpp" line="1039"/>
<source>DHT support [ON], port: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1040"/>
<location filename="../GUI.cpp" line="1045"/>
<source>DHT support [OFF]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1044"/>
<location filename="../GUI.cpp" line="1049"/>
<source>PeX support [ON]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1048"/>
<location filename="../GUI.cpp" line="1053"/>
<source>PeX support [OFF]</source>
<translation type="unfinished"></translation>
</message>
@ -956,12 +966,12 @@ Are you sure you want to quit qBittorrent?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1142"/>
<location filename="../GUI.cpp" line="1147"/>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1153"/>
<location filename="../GUI.cpp" line="1158"/>
<source>Finished</source>
<translation type="unfinished"></translation>
</message>
@ -976,17 +986,17 @@ Are you sure you want to quit qBittorrent?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1068"/>
<location filename="../GUI.cpp" line="1073"/>
<source>Encryption support [ON]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1073"/>
<location filename="../GUI.cpp" line="1078"/>
<source>Encryption support [FORCED]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1078"/>
<location filename="../GUI.cpp" line="1083"/>
<source>Encryption support [OFF]</source>
<translation type="unfinished"></translation>
</message>
@ -1056,28 +1066,28 @@ Are you sure you want to quit qBittorrent?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1053"/>
<location filename="../GUI.cpp" line="1058"/>
<source>Local Peer Discovery [ON]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1056"/>
<location filename="../GUI.cpp" line="1061"/>
<source>Local Peer Discovery support [OFF]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1404"/>
<location filename="../GUI.cpp" line="1409"/>
<source>qBittorrent %1 (DL: %2KiB/s, UP: %3KiB/s)</source>
<comment>%1 is qBittorrent version</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1389"/>
<location filename="../GUI.cpp" line="1394"/>
<source>DL: %1 KiB/s</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1390"/>
<location filename="../GUI.cpp" line="1395"/>
<source>UP: %1 KiB/s</source>
<translation type="unfinished"></translation>
</message>
@ -1092,7 +1102,7 @@ Are you sure you want to quit qBittorrent?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1441"/>
<location filename="../GUI.cpp" line="1446"/>
<source>No direct connections. This may indicate network configuration problems.</source>
<translation type="unfinished"></translation>
</message>
@ -1102,7 +1112,7 @@ Are you sure you want to quit qBittorrent?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../GUI.cpp" line="1518"/>
<location filename="../GUI.cpp" line="1523"/>
<source>Options were saved successfully.</source>
<translation type="unfinished"></translation>
</message>
@ -1438,13 +1448,13 @@ Are you sure you want to quit qBittorrent?</source>
<context>
<name>RssStream</name>
<message>
<location filename="../rss.h" line="445"/>
<location filename="../rss.h" line="452"/>
<source>%1 ago</source>
<comment>10min ago</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rss.h" line="444"/>
<location filename="../rss.h" line="451"/>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
@ -2392,22 +2402,22 @@ However, those plugins were disabled.</source>
<context>
<name>options_imp</name>
<message>
<location filename="../options_imp.cpp" line="1133"/>
<location filename="../options_imp.cpp" line="1257"/>
<source>Choose scan directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options_imp.cpp" line="1148"/>
<location filename="../options_imp.cpp" line="1272"/>
<source>Choose a save directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options_imp.cpp" line="1140"/>
<location filename="../options_imp.cpp" line="1264"/>
<source>Choose an ip filter file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../options_imp.cpp" line="1140"/>
<location filename="../options_imp.cpp" line="1264"/>
<source>Filters</source>
<translation type="unfinished"></translation>
</message>