FEATURE: Proxy can be disabled for peer connections

This commit is contained in:
Christophe Dumez
2011-05-01 11:22:17 +00:00
parent 18e08c319f
commit 65883317c3
39 changed files with 2354 additions and 2020 deletions

View File

@@ -1646,67 +1646,67 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1411"/>
<location filename="../preferences/options.ui" line="1424"/>
<source>Global Rate Limits</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1529"/>
<location filename="../preferences/options.ui" line="1542"/>
<source>Apply rate limit to uTP connections</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1536"/>
<location filename="../preferences/options.ui" line="1549"/>
<source>Apply rate limit to transport overhead</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1549"/>
<location filename="../preferences/options.ui" line="1562"/>
<source>Alternative Global Rate Limits</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1655"/>
<location filename="../preferences/options.ui" line="1668"/>
<source>Schedule the use of alternative rate limits</source>
<translation>使</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1918"/>
<location filename="../preferences/options.ui" line="1931"/>
<source>Enable Local Peer Discovery to find more peers</source>
<translation> (LSD) </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1930"/>
<location filename="../preferences/options.ui" line="1943"/>
<source>Encryption mode:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1938"/>
<location filename="../preferences/options.ui" line="1951"/>
<source>Prefer encryption</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1943"/>
<location filename="../preferences/options.ui" line="1956"/>
<source>Require encryption</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1948"/>
<location filename="../preferences/options.ui" line="1961"/>
<source>Disable encryption</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1989"/>
<location filename="../preferences/options.ui" line="2002"/>
<source>Maximum active downloads:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2009"/>
<location filename="../preferences/options.ui" line="2022"/>
<source>Maximum active uploads:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2029"/>
<location filename="../preferences/options.ui" line="2042"/>
<source>Maximum active torrents:</source>
<translation> Torrent :</translation>
</message>
@@ -1746,22 +1746,22 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation>Torrent :</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1429"/>
<location filename="../preferences/options.ui" line="1584"/>
<location filename="../preferences/options.ui" line="1442"/>
<location filename="../preferences/options.ui" line="1597"/>
<source>Upload:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1465"/>
<location filename="../preferences/options.ui" line="1611"/>
<location filename="../preferences/options.ui" line="1478"/>
<location filename="../preferences/options.ui" line="1624"/>
<source>Download:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1458"/>
<location filename="../preferences/options.ui" line="1491"/>
<location filename="../preferences/options.ui" line="1604"/>
<location filename="../preferences/options.ui" line="1631"/>
<location filename="../preferences/options.ui" line="1471"/>
<location filename="../preferences/options.ui" line="1504"/>
<location filename="../preferences/options.ui" line="1617"/>
<location filename="../preferences/options.ui" line="1644"/>
<source>KiB/s</source>
<translation>KiB/s</translation>
</message>
@@ -1771,34 +1771,34 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1696"/>
<location filename="../preferences/options.ui" line="1709"/>
<source>to</source>
<extracomment>time1 to time2</extracomment>
<translatorcomment>from 08:00 to 20:00 08:00 20:00</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1748"/>
<location filename="../preferences/options.ui" line="1761"/>
<source>Every day</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1753"/>
<location filename="../preferences/options.ui" line="1766"/>
<source>Week days</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1758"/>
<location filename="../preferences/options.ui" line="1771"/>
<source>Week ends</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1861"/>
<location filename="../preferences/options.ui" line="1874"/>
<source>DHT port:</source>
<translation>DHT :</translation>
</message>
<message utf8="true">
<location filename="../preferences/options.ui" line="1902"/>
<location filename="../preferences/options.ui" line="1915"/>
<source>Exchange peers with compatible Bittorrent clients (µTorrent, Vuze, ...)</source>
<translation>Bittorrent (µTorrent, Vuze ) </translation>
</message>
@@ -1819,7 +1819,7 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
</message>
<message>
<location filename="../preferences/options.ui" line="20"/>
<location filename="../preferences/options.ui" line="1513"/>
<location filename="../preferences/options.ui" line="1526"/>
<source>Options</source>
<translation></translation>
</message>
@@ -2002,105 +2002,115 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation>UPnP / NAT-PMP 使</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1325"/>
<location filename="../preferences/options.ui" line="1251"/>
<source>Otherwise, the proxy server is only used for tracker connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1254"/>
<source>Use proxy for peer connections</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1338"/>
<source>IP Filtering</source>
<translation>IP </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1366"/>
<location filename="../preferences/options.ui" line="1379"/>
<source>Reload the filter</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1519"/>
<location filename="../preferences/options.ui" line="1532"/>
<source>Enable bandwidth management (uTP)</source>
<translation> (uTP) </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1672"/>
<location filename="../preferences/options.ui" line="1685"/>
<source>from</source>
<extracomment>from (time1 to time2)</extracomment>
<translatorcomment>from 08:00 to 20:00 08:00 20:00</translatorcomment>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1740"/>
<location filename="../preferences/options.ui" line="1753"/>
<source>When:</source>
<translatorcomment></translatorcomment>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1823"/>
<location filename="../preferences/options.ui" line="1836"/>
<source>Privacy</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1829"/>
<location filename="../preferences/options.ui" line="1842"/>
<source>Enable DHT (decentralized network) to find more peers</source>
<translation> DHT () </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1841"/>
<location filename="../preferences/options.ui" line="1854"/>
<source>Use a different port for DHT and BitTorrent</source>
<translation>DHT BitTorrent 使</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1905"/>
<location filename="../preferences/options.ui" line="1918"/>
<source>Enable Peer Exchange (PeX) to find more peers</source>
<translation> (PeX) </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1915"/>
<location filename="../preferences/options.ui" line="1928"/>
<source>Look for peers on your local network</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2102"/>
<location filename="../preferences/options.ui" line="2115"/>
<source>Seed torrents until their ratio reaches</source>
<translation> </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2134"/>
<location filename="../preferences/options.ui" line="2147"/>
<source>then</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2145"/>
<location filename="../preferences/options.ui" line="2158"/>
<source>Pause them</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2150"/>
<location filename="../preferences/options.ui" line="2163"/>
<source>Remove them</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2248"/>
<location filename="../preferences/options.ui" line="2261"/>
<source>Use UPnP / NAT-PMP to forward the port from my router</source>
<translation>UPnP / NAT-PMP 使</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2290"/>
<location filename="../preferences/options.ui" line="2303"/>
<source>Bypass authentication for localhost</source>
<translation>localhost </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2314"/>
<location filename="../preferences/options.ui" line="2327"/>
<source>Update my dynamic domain name</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2326"/>
<location filename="../preferences/options.ui" line="2339"/>
<source>Service:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2349"/>
<location filename="../preferences/options.ui" line="2362"/>
<source>Register</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2358"/>
<location filename="../preferences/options.ui" line="2371"/>
<source>Domain name:</source>
<translation>:</translation>
</message>
@@ -2132,45 +2142,45 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
</message>
<message>
<location filename="../preferences/options.ui" line="1223"/>
<location filename="../preferences/options.ui" line="2213"/>
<location filename="../preferences/options.ui" line="2226"/>
<source>Port:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="862"/>
<location filename="../preferences/options.ui" line="1251"/>
<location filename="../preferences/options.ui" line="2258"/>
<location filename="../preferences/options.ui" line="1264"/>
<location filename="../preferences/options.ui" line="2271"/>
<source>Authentication</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="874"/>
<location filename="../preferences/options.ui" line="1268"/>
<location filename="../preferences/options.ui" line="2297"/>
<location filename="../preferences/options.ui" line="2372"/>
<location filename="../preferences/options.ui" line="1281"/>
<location filename="../preferences/options.ui" line="2310"/>
<location filename="../preferences/options.ui" line="2385"/>
<source>Username:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="884"/>
<location filename="../preferences/options.ui" line="1294"/>
<location filename="../preferences/options.ui" line="2304"/>
<location filename="../preferences/options.ui" line="2386"/>
<location filename="../preferences/options.ui" line="1307"/>
<location filename="../preferences/options.ui" line="2317"/>
<location filename="../preferences/options.ui" line="2399"/>
<source>Password:</source>
<translation>:</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1974"/>
<location filename="../preferences/options.ui" line="1987"/>
<source>Torrent Queueing</source>
<translation>Torrent </translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2091"/>
<location filename="../preferences/options.ui" line="2104"/>
<source>Share Ratio Limiting</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options.ui" line="2199"/>
<location filename="../preferences/options.ui" line="2212"/>
<source>Enable Web User Interface (Remote control)</source>
<translation> () </translation>
</message>
@@ -2180,7 +2190,7 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation>SOCKS5</translation>
</message>
<message>
<location filename="../preferences/options.ui" line="1337"/>
<location filename="../preferences/options.ui" line="1350"/>
<source>Filter path (.dat, .p2p, .p2b):</source>
<translation> (.dat, .p2p, .p2b):</translation>
</message>
@@ -2740,113 +2750,113 @@ qBittorrent をバージョン %1 へアップデートしますか?</translatio
<translation> %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2088"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2090"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2093"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2095"/>
<source>Recursive download of file %1 embedded in torrent %2</source>
<comment>Recursive download of test.torrent embedded in torrent test2</comment>
<translation>Torrent %2 %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2185"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2187"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2190"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2192"/>
<source>Unable to decode %1 torrent file.</source>
<translation>%1 Torrent </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2235"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2240"/>
<source>The computer will now go to sleep mode unless you cancel within the next 15 seconds...</source>
<translation>15 ...</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2237"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2242"/>
<source>The computer will now be switched off unless you cancel within the next 15 seconds...</source>
<translation>15 ...</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2239"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2244"/>
<source>qBittorrent will now exit unless you cancel within the next 15 seconds...</source>
<translation>15 qBittorrent ...</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2837"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2842"/>
<source>Successfuly parsed the provided IP filter: %1 rules were applied.</source>
<comment>%1 is a number</comment>
<translation> IP : %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2843"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2848"/>
<source>Error: Failed to parse the provided IP filter.</source>
<translation>エラー: 与えられた IP </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2135"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2140"/>
<source>Torrent name: %1</source>
<translation>Torrent : %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2136"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2141"/>
<source>Torrent size: %1</source>
<translation>Torrent : %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2137"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2142"/>
<source>Save path: %1</source>
<translation>: %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2138"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2143"/>
<source>The torrent was downloaded in %1.</source>
<comment>The torrent was downloaded in 1 hour and 20 seconds</comment>
<translation>Torrent %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2139"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2144"/>
<source>Thank you for using qBittorrent.</source>
<translation>qBittorrent </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2142"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2147"/>
<source>[qBittorrent] %1 has finished downloading</source>
<translation>[qBittorrent] %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2402"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2407"/>
<source>An I/O error occured, &apos;%1&apos; paused.</source>
<translation>I/O error &apos;%1&apos; </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2403"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2525"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2408"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2530"/>
<source>Reason: %1</source>
<translation>: %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2492"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2497"/>
<source>UPnP/NAT-PMP: Port mapping failure, message: %1</source>
<translation>UPnP/NAT-PMP: ポートマッピングに失敗しました: %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2497"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2502"/>
<source>UPnP/NAT-PMP: Port mapping successful, message: %1</source>
<translation>UPnP/NAT-PMP: ポートマッピングに成功しました: %1</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2520"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2525"/>
<source>File sizes mismatch for torrent %1, pausing it.</source>
<translation>Torrent %1 </translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2524"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2529"/>
<source>Fast resume data was rejected for torrent %1, checking again...</source>
<translation> Torrent %1 ...</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2530"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2535"/>
<source>Url seed lookup failed for url: %1, message: %2</source>
<translation> url url : %1: %2</translation>
</message>
<message>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2658"/>
<location filename="../qtlibtorrent/qbtsession.cpp" line="2663"/>
<source>Downloading &apos;%1&apos;, please wait...</source>
<comment>e.g: Downloading &apos;xxx.torrent&apos;, please wait...</comment>
<translation>&apos;%1&apos; ...</translation>
@@ -4845,78 +4855,78 @@ However, those plugins were disabled.</source>
<context>
<name>options_imp</name>
<message>
<location filename="../preferences/options_imp.cpp" line="1065"/>
<location filename="../preferences/options_imp.cpp" line="1067"/>
<location filename="../preferences/options_imp.cpp" line="1082"/>
<location filename="../preferences/options_imp.cpp" line="1084"/>
<location filename="../preferences/options_imp.cpp" line="1070"/>
<location filename="../preferences/options_imp.cpp" line="1072"/>
<location filename="../preferences/options_imp.cpp" line="1087"/>
<location filename="../preferences/options_imp.cpp" line="1089"/>
<source>Choose a save directory</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="987"/>
<location filename="../preferences/options_imp.cpp" line="992"/>
<source>Add directory to scan</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="993"/>
<location filename="../preferences/options_imp.cpp" line="998"/>
<source>Folder is already being watched.</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="996"/>
<location filename="../preferences/options_imp.cpp" line="1001"/>
<source>Folder does not exist.</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="999"/>
<location filename="../preferences/options_imp.cpp" line="1004"/>
<source>Folder is not readable.</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1007"/>
<location filename="../preferences/options_imp.cpp" line="1012"/>
<source>Failure</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1007"/>
<location filename="../preferences/options_imp.cpp" line="1012"/>
<source>Failed to add Scan Folder &apos;%1&apos;: %2</source>
<translation> &apos;%1&apos; : %2</translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1030"/>
<location filename="../preferences/options_imp.cpp" line="1032"/>
<location filename="../preferences/options_imp.cpp" line="1035"/>
<location filename="../preferences/options_imp.cpp" line="1037"/>
<source>Choose export directory</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1047"/>
<location filename="../preferences/options_imp.cpp" line="1049"/>
<location filename="../preferences/options_imp.cpp" line="1052"/>
<location filename="../preferences/options_imp.cpp" line="1054"/>
<source>Choose an ip filter file</source>
<translation>IP </translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1047"/>
<location filename="../preferences/options_imp.cpp" line="1049"/>
<location filename="../preferences/options_imp.cpp" line="1052"/>
<location filename="../preferences/options_imp.cpp" line="1054"/>
<source>Filters</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1147"/>
<location filename="../preferences/options_imp.cpp" line="1152"/>
<source>Parsing error</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1147"/>
<location filename="../preferences/options_imp.cpp" line="1152"/>
<source>Failed to parse the provided IP filter</source>
<translation> IP </translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1149"/>
<location filename="../preferences/options_imp.cpp" line="1154"/>
<source>Successfully refreshed</source>
<translation></translation>
</message>
<message>
<location filename="../preferences/options_imp.cpp" line="1149"/>
<location filename="../preferences/options_imp.cpp" line="1154"/>
<source>Successfuly parsed the provided IP filter: %1 rules were applied.</source>
<comment>%1 is a number</comment>
<translation> IP : %1 </translation>