From a6a046f3dffaf81bc36a2ffa919063f7660920ae Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 2 Dec 2024 23:00:19 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/0185f476efebd7565fa18f1722843664a23ddd83 --- .../luasrc/model/cbi/passwall/client/other.lua | 6 ++++-- luci-app-passwall/po/zh-cn/passwall.po | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua index 4cce5a672..11a052dd5 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -178,8 +178,9 @@ if has_xray then o = s_xray:option(Flag, "noise", translate("Noise"), translate("UDP noise, Under some circumstances it can bypass some UDP based protocol restrictions.")) o.default = 0 - o = s_xray:option(Flag, "sniffing_override_dest", translate("Override the connection destination address"), translate("Override the connection destination address with the sniffed domain.")) + o = s_xray:option(Flag, "sniffing_override_dest", translate("Override the connection destination address")) o.default = 0 + o.description = translate("Override the connection destination address with the sniffed domain.
When enabled, traffic will match only by domain, ignoring IP rules.
If using shunt nodes, configure the domain shunt rules correctly.") local domains_excluded = string.format("/usr/share/%s/rules/domains_excluded", appname) o = s_xray:option(TextValue, "excluded_domains", translate("Excluded Domains"), translate("If the traffic sniffing result is in this list, the destination address will not be overridden.")) @@ -233,9 +234,10 @@ if has_singbox then s.anonymous = true s.addremove = false - o = s:option(Flag, "sniff_override_destination", translate("Override the connection destination address"), translate("Override the connection destination address with the sniffed domain.")) + o = s:option(Flag, "sniff_override_destination", translate("Override the connection destination address")) o.default = 0 o.rmempty = false + o.description = translate("Override the connection destination address with the sniffed domain.
When enabled, traffic will match only by domain, ignoring IP rules.
If using shunt nodes, configure the domain shunt rules correctly.") o = s:option(Value, "geoip_path", translate("Custom geoip Path")) o.default = "/usr/share/singbox/geoip.db" diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index d91152c2f..d15e8206a 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -1639,8 +1639,8 @@ msgstr "握手服务器" msgid "Handshake Server Port" msgstr "握手服务器端口" -msgid "Override the connection destination address with the sniffed domain." -msgstr "用探测出的域名覆盖连接目标地址。" +msgid "Override the connection destination address with the sniffed domain.
When enabled, traffic will match only by domain, ignoring IP rules.
If using shunt nodes, configure the domain shunt rules correctly." +msgstr "用探测出的域名覆盖连接目标地址。
启用后仅使用域名进行流量匹配,将忽略IP规则。
如使用分流节点,请正确设置域名分流规则。" msgid "Protocol parameter. Will waste traffic randomly if enabled." msgstr "协议参数。如果启用会随机浪费流量。"