From 89e438c967a1d5b160750f5c2aab1faae087fc5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=91=9E?= Date: Tue, 5 Dec 2023 11:23:32 +0800 Subject: [PATCH] luci-app-tinyproxy: support socks5 upstream (#6303) Signed-off-by: Zhang Rui (cherry picked from commit fd2d2ac734429a81c9289e33635f28367a97fafe) luci-app-tinyproxy: error check socks5 upstream (#6303) Signed-off-by: Paul Donald (cherry picked from commit b3d1d056f471f82ffc931a5cffef125ce36b6d41) --- .../luasrc/model/cbi/tinyproxy.lua | 15 +++++++++++++-- .../luci-app-tinyproxy/po/ar/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/bg/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/bn_BD/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/ca/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/cs/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/da/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/de/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/el/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/en/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/es/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/fi/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/fr/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/he/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/hi/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/hu/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/it/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/ja/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/ko/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/mr/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/ms/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/nb_NO/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/pl/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/pt/tinyproxy.po | 4 ++-- .../luci-app-tinyproxy/po/pt_BR/tinyproxy.po | 4 ++-- .../luci-app-tinyproxy/po/ro/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/ru/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/sk/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/sv/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/templates/tinyproxy.pot | 2 +- .../luci-app-tinyproxy/po/tr/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/uk/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/vi/tinyproxy.po | 2 +- .../luci-app-tinyproxy/po/zh_Hans/tinyproxy.po | 4 ++-- .../luci-app-tinyproxy/po/zh_Hant/tinyproxy.po | 4 ++-- 35 files changed, 51 insertions(+), 40 deletions(-) diff --git a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua index 527d86c9d5..f8c420bc1c 100644 --- a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua +++ b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua @@ -231,10 +231,21 @@ ta.datatype = "host(1)" v = s:option(Value, "via", translate("Via proxy"), - translate("Specifies the upstream proxy to use for accessing the target host. Format is address:port")) + translate("Specifies the upstream proxy to use for accessing the target host. Format is address:port or socks5 address:port")) v:depends({type="proxy"}) v.placeholder = "10.0.0.1:8080" -v.datatype = "ip4addrport" + +function v.write(self, section, value) + + local pattern1 = "^%d+%.%d+%.%d+%.%d+:%d+$" + local pattern2 = "^socks5 %d+%.%d+%.%d+%.%d+:%d+$" + + if string.match(value, pattern1) or string.match(value, pattern2) then + Value.write(self, section, value) + else + return + end +end return m diff --git a/applications/luci-app-tinyproxy/po/ar/tinyproxy.po b/applications/luci-app-tinyproxy/po/ar/tinyproxy.po index 5c48a95065..c812fa796d 100644 --- a/applications/luci-app-tinyproxy/po/ar/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ar/tinyproxy.po @@ -269,7 +269,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/bg/tinyproxy.po b/applications/luci-app-tinyproxy/po/bg/tinyproxy.po index 29cf84d0f9..64fcb9eded 100644 --- a/applications/luci-app-tinyproxy/po/bg/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/bg/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po b/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po index d3b810c3fd..e8ef72bb06 100644 --- a/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po index e414baf0ce..fd018a8986 100644 --- a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po @@ -271,7 +271,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po index 1a9c68fd61..c959aea200 100644 --- a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po @@ -270,7 +270,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/da/tinyproxy.po b/applications/luci-app-tinyproxy/po/da/tinyproxy.po index 230f67750a..7a4a2c649a 100644 --- a/applications/luci-app-tinyproxy/po/da/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/da/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/de/tinyproxy.po b/applications/luci-app-tinyproxy/po/de/tinyproxy.po index 99f0f36527..8825f1f641 100644 --- a/applications/luci-app-tinyproxy/po/de/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/de/tinyproxy.po @@ -301,7 +301,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Spezifiziert den Upstream-Proxy über welchen auf den Zielhost zugegriffen " "wird. Das Format ist IP-Adresse:Port" diff --git a/applications/luci-app-tinyproxy/po/el/tinyproxy.po b/applications/luci-app-tinyproxy/po/el/tinyproxy.po index 3baa86b267..fdd13ca7e9 100644 --- a/applications/luci-app-tinyproxy/po/el/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/el/tinyproxy.po @@ -306,7 +306,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Καθορίζει το upstream proxy που θα χρησιμοποιηθεί για την πρόσβαση στον " "κεντρικό υπολογιστή προορισμού. Η μορφή είναι address:port" diff --git a/applications/luci-app-tinyproxy/po/en/tinyproxy.po b/applications/luci-app-tinyproxy/po/en/tinyproxy.po index bbfbad601a..6c332ad3a7 100644 --- a/applications/luci-app-tinyproxy/po/en/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/en/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/es/tinyproxy.po b/applications/luci-app-tinyproxy/po/es/tinyproxy.po index a6a0e14d1d..b3823fc132 100644 --- a/applications/luci-app-tinyproxy/po/es/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/es/tinyproxy.po @@ -289,7 +289,7 @@ msgstr "Nombre de grupo en el que se ejecuta el proceso Tinyproxy" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Proxy superior a usar para llegar al host destino. El formato es " "dirección:puerto" diff --git a/applications/luci-app-tinyproxy/po/fi/tinyproxy.po b/applications/luci-app-tinyproxy/po/fi/tinyproxy.po index 2ae4e96d8b..83174fbd93 100644 --- a/applications/luci-app-tinyproxy/po/fi/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/fi/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po index 99a1832e56..447d0e9b58 100644 --- a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po @@ -303,7 +303,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Indique un mandataire amont à utiliser pour atteindre l'hôte cible. Le " "format est adresse:port" diff --git a/applications/luci-app-tinyproxy/po/he/tinyproxy.po b/applications/luci-app-tinyproxy/po/he/tinyproxy.po index ed8251d41c..d85b8076cc 100644 --- a/applications/luci-app-tinyproxy/po/he/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/he/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/hi/tinyproxy.po b/applications/luci-app-tinyproxy/po/hi/tinyproxy.po index 5ec67fe272..1c5df737a0 100644 --- a/applications/luci-app-tinyproxy/po/hi/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/hi/tinyproxy.po @@ -266,7 +266,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po index 2f31aaa0d0..71e9edde3e 100644 --- a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po @@ -287,7 +287,7 @@ msgstr "A Tinyproxy folyamat csoportneve" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "A megadott cím eléréséhez használni kívánt proxy címe. cím:port " "formátumban kell megadni." diff --git a/applications/luci-app-tinyproxy/po/it/tinyproxy.po b/applications/luci-app-tinyproxy/po/it/tinyproxy.po index b3bb839b31..542a30c794 100644 --- a/applications/luci-app-tinyproxy/po/it/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/it/tinyproxy.po @@ -281,7 +281,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po index 81264f59e2..609ed580e6 100644 --- a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po @@ -281,7 +281,7 @@ msgstr "Tinyproxyを実行するグループを設定します" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "特定のホストにアクセスする際に使用する、上位のプロキシサーバーを設定します。" "書式は アドレス:ポート です。" diff --git a/applications/luci-app-tinyproxy/po/ko/tinyproxy.po b/applications/luci-app-tinyproxy/po/ko/tinyproxy.po index 2082d0dce8..793e9527cb 100644 --- a/applications/luci-app-tinyproxy/po/ko/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ko/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/mr/tinyproxy.po b/applications/luci-app-tinyproxy/po/mr/tinyproxy.po index 9e63638540..354eeaa802 100644 --- a/applications/luci-app-tinyproxy/po/mr/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/mr/tinyproxy.po @@ -268,7 +268,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po index 41214aaf69..bd75bbec6a 100644 --- a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po @@ -266,7 +266,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po b/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po index f891e72703..c835b20286 100644 --- a/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po @@ -266,7 +266,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po index 80404ba4f7..cd0b1dfe97 100644 --- a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po @@ -296,7 +296,7 @@ msgstr "Określ nazwę grupy, pod jaką będzie pracował proces Tinyproxy" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Określ serwer proxy typu upstream, który ma zostać użyty w przypadku dostępu " "do hosta docelowego. Format to adres:port" diff --git a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po index 034e3d5c72..baabe721ff 100644 --- a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po @@ -298,10 +298,10 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Especifica o proxy superior para usar quando acessar o alvo. Formato é " -"address:port" +"address:port or socks5 address:port" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 msgid "Specifies the user name the Tinyproxy process is running as" diff --git a/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po index 205b7f2e92..4a46000262 100644 --- a/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po @@ -297,10 +297,10 @@ msgstr "Especifica o nome do grupo com o qual o processo do Tinyproxy rodará" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Especifica o proxy superior para usar quando acessar o alvo. Formato é " -"address:port" +"address:port or socks5 address:port" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 msgid "Specifies the user name the Tinyproxy process is running as" diff --git a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po index 872efa18af..37d1f5ce04 100644 --- a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po @@ -297,7 +297,7 @@ msgstr "Specifică numele grupului sub care se execută procesul Tinyproxy" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Specifică proxy-ul din amonte care urmează să fie utilizat pentru accesarea " "gazdei țintă. Formatul este adresa:port" diff --git a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po index ffb980d4ef..6178765933 100644 --- a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po @@ -299,7 +299,7 @@ msgstr "Задайте имя группы, в которой работает T #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Задайте внешний прокси-сервер, используемый для доступа к хосту назначения. " "В виде 'адрес:порт'" diff --git a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po index c7f519f332..35c143ec70 100644 --- a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po @@ -266,7 +266,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po index bcb96c3bcc..277ab24d73 100644 --- a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po @@ -283,7 +283,7 @@ msgstr "Anger gruppnamnet som Tinyproxy-processen körs som" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Anger uppström-proxyn att använda för åtkomst till målvärden. Formatet är " "adress:port" diff --git a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot index 34b89912a6..a59048b730 100644 --- a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot +++ b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot @@ -255,7 +255,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po index c94bbb16d9..a84b6849e1 100644 --- a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po @@ -295,7 +295,7 @@ msgstr "Tinyproxy işleminin çalıştığı grup adını belirtir" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Hedef ana bilgisayara erişmek için kullanılacak yukarı akış proxy'sini " "belirtir. Biçim, address:port şeklindedir" diff --git a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po index d88c2c4f11..bf7eca9d1e 100644 --- a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po @@ -270,7 +270,7 @@ msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 diff --git a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po index 8b2b21b39f..a53c9873df 100644 --- a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po @@ -293,7 +293,7 @@ msgstr "Chỉ định tên nhóm mà quy trình Tinyproxy đang chạy dưới d #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" +"address:port or socks5 address:port" msgstr "" "Chỉ định proxy upstream để sử dụng để truy cập vào máy chủ mục tiêu. Định " "dạng là địa chỉ:cổng" diff --git a/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po index 5c1ca58fda..517a12f112 100644 --- a/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po @@ -270,8 +270,8 @@ msgstr "指定Tinyproxy进程所属组" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" -msgstr "指定上级代理. 格式 IP地址:端口" +"address:port or socks5 address:port" +msgstr "指定上级代理. 格式 IP地址:端口 或 socks5 IP地址:端口" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 msgid "Specifies the user name the Tinyproxy process is running as" diff --git a/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po index 695d56252c..bc213a642a 100644 --- a/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po +++ b/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po @@ -269,8 +269,8 @@ msgstr "指定運行Tinyproxy程序的群組名稱" #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234 msgid "" "Specifies the upstream proxy to use for accessing the target host. Format is " -"address:port" -msgstr "指定用於存取目標主機的上游代理。格式為位址：埠號 " +"address:port or socks5 address:port" +msgstr "指定用於存取目標主機的上游代理。格式為位址：埠號 或 socks5 位址：埠號 " #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92 msgid "Specifies the user name the Tinyproxy process is running as" -- 2.30.2