luci-app-tinyproxy: support socks5 upstream (#6303)

Signed-off-by: Zhang Rui <[email protected]>
(cherry picked from commit fd2d2ac734429a81c9289e33635f28367a97fafe)

luci-app-tinyproxy: error check socks5 upstream (#6303)

Signed-off-by: Paul Donald <[email protected]>
(cherry picked from commit b3d1d056f471f82ffc931a5cffef125ce36b6d41)

diff --git a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua
index 527d86c9d5f6c5dd2fb787276ccbab78d02a95d8..f8c420bc1c145d70ac2f252d5d89c1988e9582ba 100644 (file)
--- 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 <code>address:port</code>"))
+       translate("Specifies the upstream proxy to use for accessing the target host. Format is <code>address:port</code> or <code>socks5 address:port</code>"))
 
 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 5c48a95065a95ece4f18b70ab521283c4004bf7a..c812fa796d957650b406ac6e1e14dd47816c3f2a 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 29cf84d0f9d6a4bfbc2e35d0310ad2a0242286c3..64fcb9eded2c17788d6fd0e7ed893bb2ec9b4563 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 d3b810c3fd54bee5605cb4491d7d6b54828d2ac4..e8ef72bb06ce796129a88eb6542111f857f445a6 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 e414baf0cec26022af640c406ac3871b4d0f1f0d..fd018a89862787d7336f8e1e683f4c5dc8026f44 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 1a9c68fd61171f7ad3ccf88a93d125d722c51229..c959aea200185b7afeaa3cf98f317515d04fefa6 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 230f67750ab0d5f4129a8b34f1b4ae91c20deaea..7a4a2c649af0627dc60896b4cc82bad763193998 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 99f0f3652745081fbe4dc072a812e88cb8883c09..8825f1f6412da956a66d3a9557d7170f0ae099ae 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Spezifiziert den Upstream-Proxy über welchen auf den Zielhost zugegriffen "
 "wird. Das Format ist <code>IP-Adresse:Port</code>"

diff --git a/applications/luci-app-tinyproxy/po/el/tinyproxy.po b/applications/luci-app-tinyproxy/po/el/tinyproxy.po
index 3baa86b267d6502ae5a11498ee08033d1ff75304..fdd13ca7e9a104a794618f6638fee68927f51c83 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Καθορίζει το upstream proxy που θα χρησιμοποιηθεί για την πρόσβαση στον "
 "κεντρικό υπολογιστή προορισμού. Η μορφή είναι <code>address:port</code>"

diff --git a/applications/luci-app-tinyproxy/po/en/tinyproxy.po b/applications/luci-app-tinyproxy/po/en/tinyproxy.po
index bbfbad601a173b10dbf1735176927f1983bebe31..6c332ad3a736806c3835a635ef6b0de3e89b3a02 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 a6a0e14d1d8969b3e0ac4ba657bd35b364e1124e..b3823fc132cfb375eacca26f367d9f0413634b63 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Proxy superior a usar para llegar al host destino. El formato es "
 "<code>dirección:puerto</code>"

diff --git a/applications/luci-app-tinyproxy/po/fi/tinyproxy.po b/applications/luci-app-tinyproxy/po/fi/tinyproxy.po
index 2ae4e96d8b42ddedb70cb9f1e39f6485b4f6b345..83174fbd9353298ccfe2c55335585333d14d11a6 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 99a1832e5676ae0b838122006e2c4b27d0c40cdc..447d0e9b5862ee3580d288f84704e35aca0df4a0 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Indique un mandataire amont à utiliser pour atteindre l'hôte cible. Le "
 "format est <code>adresse:port</code>"

diff --git a/applications/luci-app-tinyproxy/po/he/tinyproxy.po b/applications/luci-app-tinyproxy/po/he/tinyproxy.po
index ed8251d41c660fd55b4ebc136ed5628015a2b889..d85b8076cc8f57aaded0e5265e878c2273de1051 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 5ec67fe2724743e8dcf9ae94653d9368c741ae6a..1c5df737a034044008a521b86e9ae653f8e4f57d 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 2f31aaa0d0c24ae5cfd6d9e6898d91b1a15bfdf3..71e9edde3e9c1009c6076e3b5bd877c4df33d2a4 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "A megadott cím eléréséhez használni kívánt proxy címe. <code>cím:port</code> "
 "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 b3bb839b31e3bd0678aed7c6a72f9e5bc4985b8c..542a30c7946af1ca491a76b4dd6ab791d39aca81 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 81264f59e21e4db6037ca3b79da7b9a8c6c4ff9c..609ed580e6ae564878ec03b6c2ecc9940e08d790 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "特定のホストにアクセスする際に使用する、上位のプロキシサーバーを設定します。"
 "書式は <code>アドレス:ポート</code> です。"

diff --git a/applications/luci-app-tinyproxy/po/ko/tinyproxy.po b/applications/luci-app-tinyproxy/po/ko/tinyproxy.po
index 2082d0dce8d1b0b7bd4d888a0c47ab176978125b..793e9527cb95bb0325b2485e557c8838a9d8ee0e 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 9e63638540ec5ee14ab7feb9b83802aa343bf7d5..354eeaa8023b637e57d0af7196adfadd67a30942 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 41214aaf69c117edb2ce1efa044907693ae6f2e9..bd75bbec6ab783b1eecafd13ef872147a6401f2c 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 f891e72703cda414206239f0ed3d475001f3ba10..c835b20286e78ea300c1e06956c4b12b6cd731a2 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 80404ba4f729d6655795291cb952a1f45b323a85..cd0b1dfe9760dcd759fd4a05303ab2b0b8e63583 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Określ serwer proxy typu upstream, który ma zostać użyty w przypadku dostępu "
 "do hosta docelowego. Format to <code>adres:port</code>"

diff --git a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
index 034e3d5c7232a10cc8987d073dd20413d98d540b..baabe721ff859591af68ab484845f5b40bcf92a4 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Especifica o proxy superior para usar quando acessar o alvo. Formato é "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 
 #: 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 205b7f2e9209eeb97180a0639e02f44d13d6cb54..4a46000262a585f3a545c4aa1072c10228f0489c 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Especifica o proxy superior para usar quando acessar o alvo. Formato é "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 
 #: 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 872efa18af295d245e3230b88b9955b1ea97fd83..37d1f5ce04b464abb60752622a85eca0292a6607 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Specifică proxy-ul din amonte care urmează să fie utilizat pentru accesarea "
 "gazdei țintă. Formatul este <code>adresa:port</code>"

diff --git a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
index ffb980d4ef291e880dc41d8b88d8ee863cb023c3..617876593313fb4ce9b0d06c3c796e71e4a93e06 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Задайте внешний прокси-сервер, используемый для доступа к хосту назначения. "
 "В виде <code>'адрес:порт'</code>"

diff --git a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
index c7f519f3325f23e6d3bd53f3a29027937bb886ea..35c143ec708da4ed7d2917aa0b8fa24e41c1996c 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 bcb96c3bcc58afe4ed12bcd91707c13f96652093..277ab24d739ad4b865d79bc05d7c38be949931c6 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Anger uppström-proxyn att använda för åtkomst till målvärden. Formatet är "
 "<code>adress:port</code>"

diff --git a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
index 34b89912a632b302355eb9a1f26482826f1a40f7..a59048b7303f885b8043daf912364e96b0004bc3 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 c94bbb16d9f2a4808e95aa682fd8ea2192d353e9..a84b6849e174272ddca0981032c09faceefbfc21 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Hedef ana bilgisayara erişmek için kullanılacak yukarı akış proxy'sini "
 "belirtir. Biçim, <code>address:port</code> şeklindedir"

diff --git a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
index d88c2c4f112cd9c30b098ab4dbbce946b98ad574..bf7eca9d1e07fd3494ad24dcdf827d8cec1e0112 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 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 8b2b21b39fe98b0bbe8faa7896c97093821f3297..a53c9873df57069606bef8de51753bee9f8a1c88 100644 (file)
--- 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 "
-"<code>address:port</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 "Chỉ định proxy upstream để sử dụng để truy cập vào máy chủ mục tiêu. Định "
 "dạng là <code>địa chỉ:cổng</code>"

diff --git a/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po
index 5c1ca58fdaaecbbb8032adbd2ec5aaa6ef1668f9..517a12f112aefa771ef90d581b1f3d696d2583ee 100644 (file)
--- 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 "
-"<code>address:port</code>"
-msgstr "指定上级代理. 格式 <code>IP地址:端口</code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
+msgstr "指定上级代理. 格式 <code>IP地址:端口</code> 或 <code>socks5 IP地址:端口</code>"
 
 #: 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 695d56252c9b3d05acb4890e506d218104526ac4..bc213a642a0cc15af980826890e72d92033fcba7 100644 (file)
--- 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 "
-"<code>address:port</code>"
-msgstr "指定用於存取目標主機的上游代理。格式為<code>位址：埠號 </code>"
+"<code>address:port</code> or <code>socks5 address:port</code>"
+msgstr "指定用於存取目標主機的上游代理。格式為<code>位址：埠號 </code> 或 <code>socks5 位址：埠號 </code>"
 
 #: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
 msgid "Specifies the user name the Tinyproxy process is running as"