diff --git a/Content.py b/Content.py index 00e6e30..00f37dc 100644 --- a/Content.py +++ b/Content.py @@ -20,8 +20,8 @@ import abc import sys -proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy")) -if proxy == 2: +proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy")) +if proxy == 1: import socket from resources import socks socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9050) diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index e34d555..18ac13a 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -44,7 +44,8 @@ Save files Ask to save Torrent2HTTP (libtorrent via http) - Proxy + Proxy for Search + Proxy for Content Lists None Anti-zapret Tor diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml index 855608c..40acb6f 100644 --- a/resources/language/Russian/strings.xml +++ b/resources/language/Russian/strings.xml @@ -44,7 +44,8 @@ Сохранять файлы Спросить о сохранении Torrent2HTTP (libtorrent по http) - Прокси + Прокси для поиска + Прокси для списков медиа Не использовать Anti-zapret Tor diff --git a/resources/settings.xml b/resources/settings.xml index c169044..f480bb7 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -13,6 +13,7 @@ +