Merge pull request #415 from chris5560/for-15.05
[for-15.05]luci-app-privoxy: update to version 1.0.4-2
This commit is contained in:
Jo-Philipp Wich
commit
f27ebb620c
4 changed files with 483 additions and 29 deletions
|
|
@ -10,11 +10,11 @@ PKG_NAME:=luci-app-privoxy
|
|||
|
||||
# Version == major.minor.patch
|
||||
# increase "minor" on new functionality and "patch" on patches/optimization
|
||||
PKG_VERSION:=1.0.3
|
||||
PKG_VERSION:=1.0.4
|
||||
|
||||
# Release == build
|
||||
# increase on changes of translation files
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@ end
|
|||
|
||||
-- compare versions using "<=" "<" ">" ">=" "=" "<<" ">>"
|
||||
function ipkg_ver_compare(ver1, comp, ver2)
|
||||
if not ver1 or not (#ver1 > 0)
|
||||
or not ver2 or not (#ver2 > 0)
|
||||
if not ver1 or not ver2
|
||||
or not comp or not (#comp > 0) then return nil end
|
||||
-- correct compare string
|
||||
if comp == "<>" or comp == "><" or comp == "!=" or comp == "~=" then comp = "~="
|
||||
|
|
@ -90,33 +89,19 @@ function ipkg_ver_compare(ver1, comp, ver2)
|
|||
for i = 1, math.max(table.getn(av1),table.getn(av2)), 1 do
|
||||
local s1 = av1[i] or ""
|
||||
local s2 = av2[i] or ""
|
||||
local n1 = tonumber(s1)
|
||||
local n2 = tonumber(s2)
|
||||
|
||||
-- one numeric and other empty string then set other to 0
|
||||
if n1 and not n2 and (not s2 or #s2 == 0) then n2 = 0 end
|
||||
if n2 and not n1 and (not s1 or #s1 == 0) then n1 = 0 end
|
||||
|
||||
local nc = (n1 and n2) -- numeric compare
|
||||
|
||||
if nc then
|
||||
-- first "not equal" found return true
|
||||
if comp == "~=" and (n1 ~= n2) then return true end
|
||||
-- first "lower" found return true
|
||||
if (comp == "<" or comp == "<=") and (n1 < n2) then return true end
|
||||
-- first "greater" found return true
|
||||
if (comp == ">" or comp == ">=") and (n1 > n2) then return true end
|
||||
-- not equal then return false
|
||||
if (n1 ~= n2) then return false end
|
||||
else
|
||||
if comp == "~=" and (s1 ~= s2) then return true end
|
||||
if (comp == "<" or comp == "<=") and (s1 < s2) then return true end
|
||||
if (comp == ">" or comp == ">=") and (s1 > s2) then return true end
|
||||
if (s1 ~= s2) then return false end
|
||||
end
|
||||
-- first "not equal" found return true
|
||||
if comp == "~=" and (s1 ~= s2) then return true end
|
||||
-- first "lower" found return true
|
||||
if (comp == "<" or comp == "<=") and (s1 < s2) then return true end
|
||||
-- first "greater" found return true
|
||||
if (comp == ">" or comp == ">=") and (s1 > s2) then return true end
|
||||
-- not equal then return false
|
||||
if (s1 ~= s2) then return false end
|
||||
end
|
||||
-- all equal then true
|
||||
return true
|
||||
|
||||
-- all equal and not compare greater or lower then true
|
||||
return not (comp == "<" or comp == ">")
|
||||
end
|
||||
|
||||
-- read version information for given package if installed
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ if not nixio.fs.access("/etc/config/privoxy") or not VEROK then
|
|||
local f = SimpleForm("_no_config")
|
||||
f.title = TITLE
|
||||
f.description = DESC
|
||||
f.embedded = true
|
||||
f.submit = false
|
||||
f.reset = false
|
||||
|
||||
|
|
|
|||
468
applications/luci-app-privoxy/po/zh-cn/privoxy.po
Normal file
468
applications/luci-app-privoxy/po/zh-cn/privoxy.po
Normal file
|
|
@ -0,0 +1,468 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: luci-app-privoxy\n"
|
||||
"POT-Creation-Date: 2015-06-10 20:16+0100\n"
|
||||
"PO-Revision-Date: 2015-06-10 20:16+0100\n"
|
||||
"Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: zh-cn\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 1.5.4\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
||||
msgid ""
|
||||
"A URL to be displayed in the error page that users will see if access to an "
|
||||
"untrusted page is denied."
|
||||
msgstr ""
|
||||
"当用户试图访问不受信任的页面时，错误页面所显示的URL。"
|
||||
|
||||
|
||||
msgid ""
|
||||
"A URL to documentation about the local Privoxy setup, configuration or "
|
||||
"policies."
|
||||
msgstr ""
|
||||
"指向Privoxy安装、设置和规则说明文档的URL"
|
||||
|
||||
|
||||
msgid "A directory where Privoxy can create temporary files."
|
||||
msgstr "Privoxy存放临时文件的目录。"
|
||||
|
||||
msgid "Access Control"
|
||||
msgstr "访问控制"
|
||||
|
||||
msgid "Actions that are applied to all sites and maybe overruled later on."
|
||||
msgstr ""
|
||||
"作用在所有站点上的规则，可能被后面的规则覆盖。"
|
||||
|
||||
|
||||
msgid "An alternative directory where the templates are loaded from."
|
||||
msgstr "可选的目录，放在里面的模板会被加载。"
|
||||
|
||||
msgid "An email address to reach the Privoxy administrator."
|
||||
msgstr "用于联系privoxy管理员的邮箱地址。"
|
||||
|
||||
msgid ""
|
||||
"Assumed server-side keep-alive timeout (in seconds) if not specified by the "
|
||||
"server."
|
||||
msgstr ""
|
||||
"当服务端没有指定超时时间时假定的超时时间（单位秒）。"
|
||||
|
||||
msgid "CGI user interface"
|
||||
msgstr "CGI用户界面"
|
||||
|
||||
msgid "Common Log Format"
|
||||
msgstr "通用日志格式"
|
||||
|
||||
msgid ""
|
||||
"Configure here the routing of HTTP requests through a chain of multiple "
|
||||
"proxies. Note that parent proxies can severely decrease your privacy level. "
|
||||
"Also specified here are SOCKS proxies."
|
||||
msgstr ""
|
||||
"在这里设置http请求所经过的多重代理链。"
|
||||
"注意父级代理可能严重降低你的隐私安全度。"
|
||||
"在这里还可以设置SOCKS代理。"
|
||||
|
||||
msgid "Debug GIF de-animation"
|
||||
msgstr "GIF动画日志"
|
||||
|
||||
msgid "Debug force feature"
|
||||
msgstr "force feature日志"
|
||||
|
||||
msgid "Debug redirects"
|
||||
msgstr "重定向日志"
|
||||
|
||||
msgid "Debug regular expression filters"
|
||||
msgstr "正则表达式日志"
|
||||
|
||||
msgid "Directory does not exist!"
|
||||
msgstr "目录不存在！"
|
||||
|
||||
msgid "Disabled == Transparent Proxy Mode"
|
||||
msgstr "禁用 == 透明代理模式"
|
||||
|
||||
msgid "Enable proxy authentication forwarding"
|
||||
msgstr "允许转发代理认证"
|
||||
|
||||
msgid ""
|
||||
"Enable/Disable autostart of Privoxy on system startup and interface events"
|
||||
msgstr ""
|
||||
"开启/关闭Privoxy在系统启动或者设置界面更改时自动启动。"
|
||||
|
||||
msgid "Enable/Disable filtering when Privoxy starts."
|
||||
msgstr "Privoxy启动时开启/关闭过滤。"
|
||||
|
||||
msgid "Enabled"
|
||||
msgstr "已开启"
|
||||
|
||||
msgid ""
|
||||
"Enabling this option is NOT recommended if there is no parent proxy that "
|
||||
"requires authentication!"
|
||||
msgstr ""
|
||||
"父级代理不需要认证时不推荐开启这个选项！"
|
||||
|
||||
msgid "File '%s' not found inside Configuration Directory"
|
||||
msgstr "文件 '%s' 没有在设置目录中找到！"
|
||||
|
||||
msgid "File not found or empty"
|
||||
msgstr "文件不存在或为空"
|
||||
|
||||
msgid "Files and Directories"
|
||||
msgstr "文件和目录"
|
||||
|
||||
msgid "For help use link at the relevant option"
|
||||
msgstr ""
|
||||
"在相应选项下的连接可获取帮助。"
|
||||
|
||||
msgid "Forwarding"
|
||||
msgstr "转发"
|
||||
|
||||
msgid ""
|
||||
"If enabled, Privoxy hides the 'go there anyway' link. The user obviously "
|
||||
"should not be able to bypass any blocks."
|
||||
msgstr ""
|
||||
"如果启用，Privoxy会隐藏'go there anyway'链接。用户显然不应能绕过屏蔽。"
|
||||
|
||||
msgid ""
|
||||
"If you intend to operate Privoxy for more users than just yourself, it might "
|
||||
"be a good idea to let them know how to reach you, what you block and why you "
|
||||
"do that, your policies, etc."
|
||||
msgstr ""
|
||||
"如果除了你还有其他用户通过privoxy连接，让他们知道如何联系你、什么内容被屏蔽了、"
|
||||
"你为什么要这么做、你所制定的规范等等是一个好主意。"
|
||||
|
||||
msgid "Invalid email address"
|
||||
msgstr "邮箱地址无效"
|
||||
|
||||
msgid "It is NOT recommended for the casual user."
|
||||
msgstr "不推荐新手使用。"
|
||||
|
||||
msgid "Local Set-up"
|
||||
msgstr "本地设置"
|
||||
|
||||
msgid "Location of the Privoxy User Manual."
|
||||
msgstr "Privoxy用户手册位置"
|
||||
|
||||
msgid "Log File Viewer"
|
||||
msgstr "日志查看器"
|
||||
|
||||
msgid "Log all data read from the network"
|
||||
msgstr "记录所有从网络接收的数据"
|
||||
|
||||
msgid "Log all data written to the network"
|
||||
msgstr "记录所有发送给网络的数据"
|
||||
|
||||
msgid "Log the applying actions"
|
||||
msgstr "记录被应用的规则"
|
||||
|
||||
msgid ""
|
||||
"Log the destination for each request Privoxy let through. See also 'Debug "
|
||||
"1024'."
|
||||
msgstr ""
|
||||
"记录Privoxy所允许的所有请求。另请参考'Debug 1024'。"
|
||||
|
||||
msgid ""
|
||||
"Log the destination for requests Privoxy didn't let through, and the reason "
|
||||
"why."
|
||||
msgstr ""
|
||||
"记录被Privoxy拒绝的请求目标以及拒绝原因。"
|
||||
|
||||
msgid "Logging"
|
||||
msgstr "日志"
|
||||
|
||||
msgid "Main actions file"
|
||||
msgstr "主要规则文件"
|
||||
|
||||
msgid "Mandatory Input: No Data given!"
|
||||
msgstr "必需选项: 没有设置数据！"
|
||||
|
||||
msgid "Mandatory Input: No Directory given!"
|
||||
msgstr "必需选项: 没有设置目录！"
|
||||
|
||||
msgid "Mandatory Input: No File given!"
|
||||
msgstr "必需选项: 没有设置文件！"
|
||||
|
||||
msgid "Mandatory Input: No Port given!"
|
||||
msgstr "必需选项: 没有设置端口！"
|
||||
|
||||
msgid "Mandatory Input: No files given!"
|
||||
msgstr "必需选项: 没有设置文件！"
|
||||
|
||||
msgid "Mandatory Input: No valid IPv4 address or host given!"
|
||||
msgstr ""
|
||||
"必需选项: 没有设置有效的IPV4地址或者主机！"
|
||||
|
||||
msgid "Mandatory Input: No valid IPv6 address given!"
|
||||
msgstr "必需选项: 没有设置有效的IPV6地址！"
|
||||
|
||||
msgid "Mandatory Input: No valid Port given!"
|
||||
msgstr "必需选项: 没有设置有效的端口！"
|
||||
|
||||
msgid "Maximum number of client connections that will be served."
|
||||
msgstr "客户端数量上限。"
|
||||
|
||||
msgid "Maximum size (in KB) of the buffer for content filtering."
|
||||
msgstr "内容过滤的最大缓冲（单位KB）。"
|
||||
|
||||
msgid "Miscellaneous"
|
||||
msgstr "杂项"
|
||||
|
||||
msgid "No trailing '/', please."
|
||||
msgstr "路径结尾不要加'/' ."
|
||||
|
||||
msgid "Non-fatal errors - *we highly recommended enabling this*"
|
||||
msgstr ""
|
||||
"非致命性错误 - * 建议开启 *"
|
||||
|
||||
msgid ""
|
||||
"Number of seconds after which a socket times out if no data is received."
|
||||
msgstr ""
|
||||
"socket连接未收到数据的超时时间。"
|
||||
|
||||
msgid ""
|
||||
"Number of seconds after which an open connection will no longer be reused."
|
||||
msgstr ""
|
||||
"一个开放的连接不再重复使用的超时时间。"
|
||||
|
||||
msgid ""
|
||||
"Only when using 'external filters', Privoxy has to create temporary files."
|
||||
msgstr ""
|
||||
"只有使用外置规则时，privoxy才需要创建临时文件。"
|
||||
|
||||
msgid "Please press [Read] button"
|
||||
msgstr "请点击[读取]按钮"
|
||||
|
||||
msgid "Please read Privoxy manual for details!"
|
||||
msgstr "请阅读Privoxy手册以了解详情！"
|
||||
|
||||
msgid "Please update to the current version!"
|
||||
msgstr "请升级到当前版本！"
|
||||
|
||||
msgid "Privoxy WEB proxy"
|
||||
msgstr "Privoxy 网络代理"
|
||||
|
||||
msgid ""
|
||||
"Privoxy can (and normally does) use a number of other files for additional "
|
||||
"configuration, help and logging. This section of the configuration file "
|
||||
"tells Privoxy where to find those other files."
|
||||
msgstr ""
|
||||
"Privoxy可以使用其他一些文件用于附加设置，帮助和日志。这个区域用来告诉Privoxy从哪里找到这些文件。"
|
||||
|
||||
msgid ""
|
||||
"Privoxy is a non-caching web proxy with advanced filtering capabilities for "
|
||||
"enhancing privacy, modifying web page data and HTTP headers, controlling "
|
||||
"access, and removing ads and other obnoxious Internet junk."
|
||||
msgstr ""
|
||||
"Privoxy是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和HTTP头，控制访问，移除广告等。"
|
||||
|
||||
msgid "Read / Reread log file"
|
||||
msgstr "读取/刷新日志文件"
|
||||
|
||||
msgid "Show I/O status"
|
||||
msgstr "显示 I/O 状态"
|
||||
|
||||
msgid "Show each connection status"
|
||||
msgstr "显示每个连接的状态"
|
||||
|
||||
msgid "Show header parsing"
|
||||
msgstr "Show header parsing"
|
||||
|
||||
msgid "Software update required"
|
||||
msgstr "需要升级软件"
|
||||
|
||||
msgid "Start"
|
||||
msgstr "启动"
|
||||
|
||||
msgid "Start / Stop"
|
||||
msgstr "启动 / 停止"
|
||||
|
||||
msgid "Start/Stop Privoxy WEB Proxy"
|
||||
msgstr "启动/停止 Privoxy 网络代理"
|
||||
|
||||
msgid "Startup banner and warnings."
|
||||
msgstr "启动标语和警告。"
|
||||
|
||||
msgid "Syntax:"
|
||||
msgstr "格式:"
|
||||
|
||||
msgid "Syntax: Client header names delimited by spaces."
|
||||
msgstr "格式: Client header names delimited by spaces."
|
||||
|
||||
msgid "Syntax: target_pattern http_parent[:port]"
|
||||
msgstr "格式: target_pattern http_parent[:port]"
|
||||
|
||||
msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
|
||||
msgstr "格式: target_pattern socks_proxy[:port] http_parent[:port]"
|
||||
|
||||
msgid ""
|
||||
"The actions file(s) to use. Multiple actionsfile lines are permitted, and "
|
||||
"are in fact recommended!"
|
||||
msgstr ""
|
||||
"所使用的规则文件。允许并且推荐使用多个规则文件。"
|
||||
|
||||
msgid ""
|
||||
"The address and TCP port on which Privoxy will listen for client requests."
|
||||
msgstr ""
|
||||
"Privoxy接收客户端请求时监听的地址和TCP端口。"
|
||||
|
||||
msgid ""
|
||||
"The compression level that is passed to the zlib library when compressing "
|
||||
"buffered content."
|
||||
msgstr ""
|
||||
"使用zlib压缩缓冲内容时的压缩级别。"
|
||||
|
||||
msgid ""
|
||||
"The currently installed 'privoxy' package is not supported by LuCI "
|
||||
"application."
|
||||
msgstr ""
|
||||
"目前安装的privoxy版本不被luci支持。"
|
||||
|
||||
msgid ""
|
||||
"The directory where all logging takes place (i.e. where the logfile is "
|
||||
"located)."
|
||||
msgstr "所有日志所在的目录。"
|
||||
|
||||
msgid "The directory where the other configuration files are located."
|
||||
msgstr "其他设置文件所在的目录。"
|
||||
|
||||
msgid ""
|
||||
"The filter files contain content modification rules that use regular "
|
||||
"expressions."
|
||||
msgstr ""
|
||||
"过滤文件包含了使用正则表达式编写的内容修改规则"
|
||||
|
||||
msgid "The hostname shown on the CGI pages."
|
||||
msgstr "CGI页面显示的主机名。"
|
||||
|
||||
msgid "The log file to use. File name, relative to log directory."
|
||||
msgstr ""
|
||||
"日志文件名称，与日志路径相对。"
|
||||
|
||||
msgid "The order in which client headers are sorted before forwarding them."
|
||||
msgstr ""
|
||||
"转发数据前，client headers的排序。"
|
||||
|
||||
msgid ""
|
||||
"The status code Privoxy returns for pages blocked with +handle-as-empty-"
|
||||
"document."
|
||||
msgstr ""
|
||||
"当页面因为handle-as-empty-document规则被阻止时返回的状态码（选上为200 OK，不选上为403 Forbidden）"
|
||||
|
||||
msgid ""
|
||||
"The trust mechanism is an experimental feature for building white-lists and "
|
||||
"should be used with care."
|
||||
msgstr ""
|
||||
"信任机制是一个实验性的白名单特性，使用时应小心。"
|
||||
|
||||
msgid ""
|
||||
"The value of this option only matters if the experimental trust mechanism "
|
||||
"has been activated."
|
||||
msgstr ""
|
||||
"只有开启了信任机制时这个选项的值才有效"
|
||||
|
||||
msgid ""
|
||||
"This option is only there for debugging purposes. It will drastically reduce "
|
||||
"performance."
|
||||
msgstr ""
|
||||
"这个选项仅用于调试，开启后会极大地降低性能。"
|
||||
|
||||
msgid ""
|
||||
"This option will be removed in future releases as it has been obsoleted by "
|
||||
"the more general header taggers."
|
||||
msgstr "这个选项在以后的版本中将被移除，因为它被header taggers所取代了。"
|
||||
|
||||
msgid ""
|
||||
"This tab controls the security-relevant aspects of Privoxy's configuration."
|
||||
msgstr ""
|
||||
"这个标签用于设置与安全相关的Privoxy选项。"
|
||||
|
||||
msgid ""
|
||||
"Through which SOCKS proxy (and optionally to which parent HTTP proxy) "
|
||||
"specific requests should be routed."
|
||||
msgstr ""
|
||||
"指定的请求应该通过哪一个SOCKS代理（并且通过哪一个HTTP父代理，可选）"
|
||||
|
||||
msgid "To which parent HTTP proxy specific requests should be routed."
|
||||
msgstr ""
|
||||
"请求应转发至哪一个父级HTTP代理。"
|
||||
|
||||
msgid "User customizations"
|
||||
msgstr "用户自定义"
|
||||
|
||||
msgid "Value is not a number"
|
||||
msgstr "输入值不是数字"
|
||||
|
||||
msgid "Value not between 0 and 9"
|
||||
msgstr "输入值不在0和9之间。"
|
||||
|
||||
msgid "Value not between 1 and 4096"
|
||||
msgstr "输入值不在1和4096之间"
|
||||
|
||||
msgid "Value not greater 0 or empty"
|
||||
msgstr "输入值为空或者不是大于零。"
|
||||
|
||||
msgid "Value range 1 to 4096, no entry defaults to 4096"
|
||||
msgstr "输入值为1到4096，默认为4096"
|
||||
|
||||
msgid "Version"
|
||||
msgstr "版本"
|
||||
|
||||
msgid "Version Information"
|
||||
msgstr "版本信息"
|
||||
|
||||
msgid "Whether intercepted requests should be treated as valid."
|
||||
msgstr "被拦截的请求是否应被当作有效的。"
|
||||
|
||||
msgid ""
|
||||
"Whether or not Privoxy recognizes special HTTP headers to change toggle "
|
||||
"state."
|
||||
msgstr ""
|
||||
"Privoxy是否识别特殊的HTTP头以切换状态。"
|
||||
|
||||
msgid "Whether or not buffered content is compressed before delivery."
|
||||
msgstr ""
|
||||
"缓冲内容在传递之前是否压缩。"
|
||||
|
||||
msgid ""
|
||||
"Whether or not outgoing connections that have been kept alive should be "
|
||||
"shared between different incoming connections."
|
||||
msgstr ""
|
||||
"持久出站连接是否应在不同的入站连接之间共享。"
|
||||
|
||||
msgid "Whether or not pipelined requests should be served."
|
||||
msgstr "是否处理管道化的请求。"
|
||||
|
||||
msgid "Whether or not proxy authentication through Privoxy should work."
|
||||
msgstr "是否可以通过Privoxy进行代理验证。"
|
||||
|
||||
msgid "Whether or not the web-based actions file editor may be used."
|
||||
msgstr "是否使用基于网页的规则编辑器。"
|
||||
|
||||
msgid "Whether or not the web-based toggle feature may be used."
|
||||
msgstr "是否启用基于网页的切换功能。"
|
||||
|
||||
msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected."
|
||||
msgstr "访问Privoxy CGI页面的请求是否可以被拦截或重定向。"
|
||||
|
||||
|
||||
msgid ""
|
||||
"Whether the CGI interface should stay compatible with broken HTTP clients."
|
||||
msgstr ""
|
||||
"CGI界面是否应兼容过时的HTTP客户端。"
|
||||
|
||||
msgid "Whether to run only one server thread."
|
||||
msgstr "是否只运行一个服务线程。"
|
||||
|
||||
msgid "Who can access what."
|
||||
msgstr "谁可以访问什么。"
|
||||
|
||||
msgid "installed"
|
||||
msgstr "已安装"
|
||||
|
||||
msgid "or higher"
|
||||
msgstr "或更高"
|
||||
|
||||
msgid "required"
|
||||
msgstr "需要"
|
||||
Loading…
Reference in a new issue