luci-app-privoxy: fix description for socks5

Privoxy supports login password for socks5 proxy forwarding. It allows
use proxy in format [user:pass@]socks_proxy[:port] http_parent[:port]
as noted in the official documentations.

Signed-off-by: Ivan Romanov <drizt72@zoho.eu>

1 files changed, 51 insertions, 49 deletions

diff --git a/applications/luci-app-privoxy/po/zh_Hans/privoxy.po b/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
index 2ea813e2d8..a985a3a95f 100644
--- a/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
+++ b/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
@@ -50,7 +50,7 @@ msgstr "可选的目录，放在里面的模板会被加载。"
 msgid "An email address to reach the Privoxy administrator."
 msgstr "用于联系 Privoxy 管理员的邮箱地址。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:691
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:695
 msgid ""
 "Assumed server-side keep-alive timeout (in seconds) if not specified by the "
 "server."
@@ -60,11 +60,11 @@ msgstr "当服务端没有指定超时时间时假定的超时时间（单位：
 msgid "Boot delay"
 msgstr "启动延时"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:869
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:873
 msgid "CGI user interface"
 msgstr "CGI 用户界面"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:857
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:861
 msgid "Common Log Format"
 msgstr "通用日志格式"
 
@@ -77,19 +77,19 @@ msgstr ""
 "在这里设置 HTTP 请求所经过的多重代理链。注意：父级代理可能严重降低您的隐私安"
 "全度。在这里还可以设置 SOCKS 代理。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:851
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:855
 msgid "Debug GIF de-animation"
 msgstr "调试 GIF 动画"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:833
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:837
 msgid "Debug force feature"
 msgstr "调试 Force feature"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:845
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:849
 msgid "Debug redirects"
 msgstr "调试重定向"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:839
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:843
 msgid "Debug regular expression filters"
 msgstr "调试正则表达式"
 
@@ -145,7 +145,7 @@ msgstr "如果没有需要认证的父级代理时，不推荐开启这个选项
 msgid "File '%s' not found inside Configuration Directory"
 msgstr "在设置目录中未找到文件“%s”"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:915
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:919
 #: applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm:12
 msgid "File not found or empty"
 msgstr "文件不存在或为空"
@@ -198,25 +198,25 @@ msgstr "Privoxy 用户手册位置。"
 msgid "Log File Viewer"
 msgstr "日志查看器"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:895
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:899
 msgid "Log all data read from the network"
 msgstr "记录所有接收的网络数据"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:827
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:831
 msgid "Log all data written to the network"
 msgstr "记录所有发送的网络数据"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:901
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:905
 msgid "Log the applying actions"
 msgstr "记录配置保存动作"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:803
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:807
 msgid ""
 "Log the destination for each request Privoxy let through. See also 'Debug "
 "1024'."
 msgstr "记录 Privoxy 允许的所有请求。另请参考“Debug 1024”。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:863
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:867
 msgid ""
 "Log the destination for requests Privoxy didn't let through, and the reason "
 "why."
@@ -265,7 +265,7 @@ msgstr "必需选项：没有设置有效的 IPv6 地址！"
 msgid "Mandatory Input: No valid Port given!"
 msgstr "必需选项：没有设置有效的端口！"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:733
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:737
 msgid "Maximum number of client connections that will be served."
 msgstr "客户端数量上限。"
 
@@ -288,16 +288,16 @@ msgstr "未安装"
 msgid "No trailing '/', please."
 msgstr "路径结尾不要加“/”。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:881
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:885
 msgid "Non-fatal errors - *we highly recommended enabling this*"
 msgstr "非致命性错误 - *强烈建议启用*"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:714
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:718
 msgid ""
 "Number of seconds after which a socket times out if no data is received."
 msgstr "Socket 连接未收到数据的超时时间。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:668
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:672
 msgid ""
 "Number of seconds after which an open connection will no longer be reused."
 msgstr "开放的连接不再重复使用的超时时间。"
@@ -311,7 +311,7 @@ msgstr "只有使用外置规则时，Privoxy 才需要创建临时文件。"
 msgid "Please install current version !"
 msgstr "请安装当前版本！"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:913
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:917
 msgid "Please press [Read] button"
 msgstr "请按下 [读取] 按钮"
 
@@ -346,19 +346,19 @@ msgstr ""
 "Privoxy 是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和 HTTP 请"
 "求头、控制访问、移除广告等。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:908
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:912
 msgid "Read / Reread log file"
 msgstr "读取/重新读取 日志文件"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:815
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:819
 msgid "Show I/O status"
 msgstr "显示 I/O 状态"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:809
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:813
 msgid "Show each connection status"
 msgstr "显示每个连接的状态"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:821
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:825
 msgid "Show header parsing"
 msgstr "显示请求头 解析"
 
@@ -383,15 +383,17 @@ msgstr "启动 / 停止"
 msgid "Start/Stop Privoxy WEB Proxy"
 msgstr "启动/停止 Privoxy 网络代理"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:875
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:879
 msgid "Startup banner and warnings."
 msgstr "启动标语和警告。"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:455
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:620
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:635
 msgid "Syntax:"
 msgstr "语法："
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:786
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:790
 msgid "Syntax: Client header names delimited by spaces."
 msgstr "格式：由空格分隔的客户端请求头名称。"
 
@@ -399,10 +401,6 @@ msgstr "格式：由空格分隔的客户端请求头名称。"
 msgid "Syntax: target_pattern http_parent[:port]"
 msgstr "格式：target_pattern http_parent[:port]"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:620
-msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
-msgstr "格式：target_pattern socks_proxy[:port] http_parent[:port]"
-
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:59
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:62
 msgid "System"
@@ -419,7 +417,7 @@ msgid ""
 "The address and TCP port on which Privoxy will listen for client requests."
 msgstr "Privoxy 接收客户端请求时监听的地址和 TCP 端口。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:766
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:770
 msgid ""
 "The compression level that is passed to the zlib library when compressing "
 "buffered content."
@@ -449,11 +447,11 @@ msgstr "CGI 页面显示的主机名。"
 msgid "The log file to use. File name, relative to log directory."
 msgstr "日志文件名称，与日志路径相对。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:784
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:788
 msgid "The order in which client headers are sorted before forwarding them."
 msgstr "转发数据前，客户端请求头的排序。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:751
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:755
 msgid ""
 "The status code Privoxy returns for pages blocked with +handle-as-empty-"
 "document."
@@ -471,7 +469,7 @@ msgid ""
 "has been activated."
 msgstr "只有开启了信任机制时这个选项的值才有效。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:796
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:800
 msgid ""
 "This option is only there for debugging purposes. It will drastically reduce "
 "performance."
@@ -489,6 +487,7 @@ msgid ""
 msgstr "这个标签用于设置与安全相关的 Privoxy 选项。"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:618
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:633
 msgid ""
 "Through which SOCKS proxy (and optionally to which parent HTTP proxy) "
 "specific requests should be routed."
@@ -505,11 +504,11 @@ msgstr "用户自定义"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:166
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:543
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:673
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:696
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:720
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:739
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:772
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:677
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:700
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:724
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:743
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:776
 msgid "Value is not a number"
 msgstr "输入值不是一个数字"
 
@@ -517,7 +516,7 @@ msgstr "输入值不是一个数字"
 msgid "Value not between 0 and 300"
 msgstr "输入值不在 0 和 300 之间"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:774
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:778
 msgid "Value not between 0 and 9"
 msgstr "输入值不在 0 和 9 之间"
 
@@ -525,10 +524,10 @@ msgstr "输入值不在 0 和 9 之间"
 msgid "Value not between 1 and 4096"
 msgstr "输入值不在 1 和 4096 之间"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:675
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:698
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:722
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:741
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:679
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:702
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:726
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:745
 msgid "Value not greater 0 or empty"
 msgstr "输入值为空或者不是大于零"
 
@@ -546,7 +545,7 @@ msgstr "版本"
 msgid "Version Information"
 msgstr "版本信息"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:646
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:650
 msgid "Whether intercepted requests should be treated as valid."
 msgstr "是否应把被拦截的请求当作是有效的。"
 
@@ -556,17 +555,17 @@ msgid ""
 "state."
 msgstr "是否让 Privoxy 识别特殊的 HTTP 请求头以切换状态。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:758
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:762
 msgid "Whether or not buffered content is compressed before delivery."
 msgstr "是否在传递之前压缩缓冲内容。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:706
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:710
 msgid ""
 "Whether or not outgoing connections that have been kept alive should be "
 "shared between different incoming connections."
 msgstr "是否应在不同的入站连接之间共享持久出站连接。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:683
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:687
 msgid "Whether or not pipelined requests should be served."
 msgstr "是否处理管道化的请求。"
 
@@ -582,16 +581,16 @@ msgstr "是否使用基于网页的规则编辑器。"
 msgid "Whether or not the web-based toggle feature may be used."
 msgstr "是否启用基于网页的切换功能。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:653
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:657
 msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected."
 msgstr "是否可以被拦截或重定向访问 Privoxy CGI 页面的请求。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:660
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:664
 msgid ""
 "Whether the CGI interface should stay compatible with broken HTTP clients."
 msgstr "是否让 CGI 界面兼容过时的 HTTP 客户端。"
 
-#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:794
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:798
 msgid "Whether to run only one server thread."
 msgstr "是否只运行一个服务线程。"
 
@@ -616,3 +615,6 @@ msgstr "或更高"
 #: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:89
 msgid "required"
 msgstr "需要"
+
+#~ msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
+#~ msgstr "格式：target_pattern socks_proxy[:port] http_parent[:port]"