Skip to content

Commit

Permalink
luci-app-privoxy: fix description for socks5
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@drizt @systemcrash
drizt authored and systemcrash committed Sep 5, 2024
1 parent 38be266 commit e36e949
Show file tree
Hide file tree
Showing 37 changed files with 1,840 additions and 1,831 deletions.
10 changes: 7 additions & 3 deletions applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,8 @@ local fs4 = ns:taboption("forward", DynamicList, "forward_socks4")
fs4.title = string.format(HELP, "SOCKS", "Forward SOCKS 4" )
fs4.description = translate("Through which SOCKS proxy (and optionally to which parent HTTP proxy) specific requests should be routed.")
.. [[<br />]]
.. translate("Syntax: target_pattern socks_proxy[:port] http_parent[:port]")
.. translate("Syntax:")
.. " target_pattern socks_proxy[:port] http_parent[:port]"
fs4.rmempty = true

-- forward-socks4a -------------------------------------------------------------
Expand All @@ -629,13 +630,16 @@ f4a.rmempty = true
-- forward-socks5 --------------------------------------------------------------
local fs5 = ns:taboption("forward", DynamicList, "forward_socks5")
fs5.title = string.format(HELP, "SOCKS", "Forward SOCKS 5" )
fs5.description = fs4.description
fs5.description = translate("Through which SOCKS proxy (and optionally to which parent HTTP proxy) specific requests should be routed.")
.. [[<br />]]
.. translate("Syntax:")
.. " target_pattern [user:pass@]socks_proxy[:port] http_parent[:port]"
fs5.rmempty = true

-- forward-socks5t -------------------------------------------------------------
local f5t = ns:taboption("forward", DynamicList, "forward_socks5t")
f5t.title = string.format(HELP, "SOCKS", "Forward SOCKS 5t" )
f5t.description = fs4.description
f5t.description = fs5.description
f5t.rmempty = true

-- tab: misc -- ################################################################
Expand Down
97 changes: 48 additions & 49 deletions applications/luci-app-privoxy/po/ar/privoxy.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "An email address to reach the Privoxy administrator."
msgstr ""

#: 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."
Expand All @@ -54,11 +54,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 ""

#: 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 ""

Expand All @@ -69,19 +69,19 @@ msgid ""
"Also specified here are SOCKS proxies."
msgstr ""

#: 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 ""

#: 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 ""

#: 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 ""

Expand Down Expand Up @@ -137,7 +137,7 @@ msgstr ""
msgid "File '%s' not found inside Configuration Directory"
msgstr ""

#: 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 ""
Expand Down Expand Up @@ -188,25 +188,25 @@ msgstr ""
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 ""

#: 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."
Expand Down Expand Up @@ -255,7 +255,7 @@ msgstr ""
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 ""

Expand All @@ -278,16 +278,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 ""

#: 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 ""
Expand All @@ -301,7 +301,7 @@ msgstr ""
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 "الرجاء الضغط على زر [قراءة]"

Expand Down Expand Up @@ -332,19 +332,19 @@ msgid ""
"access, and removing ads and other obnoxious Internet junk."
msgstr ""

#: 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 ""

#: 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 ""

Expand All @@ -369,26 +369,24 @@ msgstr ""
msgid "Start/Stop Privoxy WEB Proxy"
msgstr ""

#: 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 ""

#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:612
msgid "Syntax: target_pattern http_parent[:port]"
msgstr ""

#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:620
msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
msgstr ""

#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:59
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:62
msgid "System"
Expand All @@ -405,7 +403,7 @@ msgid ""
"The address and TCP port on which Privoxy will listen for client requests."
msgstr ""

#: 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."
Expand Down Expand Up @@ -435,11 +433,11 @@ msgstr ""
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."
Expand All @@ -457,7 +455,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."
Expand All @@ -475,6 +473,7 @@ msgid ""
msgstr ""

#: 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."
Expand All @@ -490,30 +489,30 @@ 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 ""

#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:168
msgid "Value not between 0 and 300"
msgstr ""

#: 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 ""

#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:545
msgid "Value not between 1 and 4096"
msgstr ""

#: 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 ""

Expand All @@ -531,7 +530,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 ""

Expand All @@ -541,17 +540,17 @@ msgid ""
"state."
msgstr ""

#: 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 ""

Expand All @@ -567,16 +566,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 ""

#: 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 ""

#: 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 ""

Expand Down
Loading

0 comments on commit e36e949

Please sign in to comment.