From b8c70bb096e52bd77eb15e129b62d7604ec1a0ff Mon Sep 17 00:00:00 2001 From: actions-user Date: Wed, 4 Sep 2024 00:15:57 +0800 Subject: [PATCH] update 2024-09-04 00:15:57 --- luci-app-homeproxy/README | 1 - .../resources/view/homeproxy/client.js | 33 +- .../resources/view/homeproxy/status.js | 3 +- luci-app-homeproxy/po/templates/homeproxy.pot | 659 +++++++++-------- luci-app-homeproxy/po/zh_Hans/homeproxy.po | 664 +++++++++--------- .../etc/homeproxy/scripts/firewall_post.ut | 12 +- .../homeproxy/scripts/update_subscriptions.uc | 5 +- .../etc/uci-defaults/luci-homeproxy-migration | 5 + .../model/cbi/passwall/client/global.lua | 52 +- luci-app-passwall/po/zh-cn/passwall.po | 6 + .../root/usr/share/passwall/app.sh | 36 +- 11 files changed, 765 insertions(+), 711 deletions(-) diff --git a/luci-app-homeproxy/README b/luci-app-homeproxy/README index 211bd90608..aea47fe629 100644 --- a/luci-app-homeproxy/README +++ b/luci-app-homeproxy/README @@ -1,6 +1,5 @@ TODO: - Subscription page slow response with a large number of nodes - Refactor nft rules -- Support Clash selector, urltest etc. - Move ACL settings to a dedicated page - Any other improvements diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js index 3670649261..5c993fbe41 100644 --- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js +++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js @@ -106,6 +106,17 @@ return view.extend({ var features = data[1], hosts = data[2]?.hosts; + /* Cache all configured proxy nodes, they will be called multiple times */ + var proxy_nodes = {}; + uci.sections(data[0], 'node', (res) => { + var nodeaddr = ((res.type === 'direct') ? res.override_address : res.address) || '', + nodeport = ((res.type === 'direct') ? res.override_port : res.port) || ''; + + proxy_nodes[res['.name']] = + String.format('[%s] %s', res.type, res.label || ((stubValidator.apply('ip6addr', nodeaddr) ? + String.format('[%s]', nodeaddr) : nodeaddr) + ':' + nodeport)); + }); + m = new form.Map('homeproxy', _('HomeProxy'), _('The modern ImmortalWrt proxy platform for ARM64/AMD64.')); @@ -123,17 +134,6 @@ return view.extend({ ]); } - /* Cache all configured proxy nodes, they will be called multiple times */ - var proxy_nodes = {}; - uci.sections(data[0], 'node', (res) => { - var nodeaddr = ((res.type === 'direct') ? res.override_address : res.address) || '', - nodeport = ((res.type === 'direct') ? res.override_port : res.port) || ''; - - proxy_nodes[res['.name']] = - String.format('[%s] %s', res.type, res.label || ((stubValidator.apply('ip6addr', nodeaddr) ? - String.format('[%s]', nodeaddr) : nodeaddr) + ':' + nodeport)); - }); - s = m.section(form.NamedSection, 'config', 'homeproxy'); s.tab('routing', _('Routing Settings')); @@ -234,14 +234,11 @@ return view.extend({ o = s.taboption('routing', form.Value, 'routing_port', _('Routing ports'), _('Specify target ports to be proxied. Multiple ports must be separated by commas.')); - o.value('all', _('All ports')); + o.value('', _('All ports')); o.value('common', _('Common ports only (bypass P2P traffic)')); o.default = 'common'; - o.rmempty = false; o.validate = function(section_id, value) { - if (section_id && value !== 'all' && value !== 'common') { - if (!value) - return _('Expecting: %s').format(_('valid port value')); + if (section_id && value && value !== 'common') { var ports = []; for (var i of value.split(',')) { @@ -383,7 +380,7 @@ return view.extend({ so.editable = true; so = ss.option(form.ListValue, 'domain_strategy', _('Domain strategy'), - _('If set, the server domain name will be resolved to IP before connecting.
dns.strategy will be used if empty.')); + _('If set, the server domain name will be resolved to IP before connecting.
')); for (var i in hp.dns_strategy) so.value(i, hp.dns_strategy[i]); so.modalonly = true; @@ -725,7 +722,7 @@ return view.extend({ so.modalonly = true; so = ss.option(form.ListValue, 'address_strategy', _('Address strategy'), - _('The domain strategy for resolving the domain name in the address. dns.strategy will be used if empty.')); + _('The domain strategy for resolving the domain name in the address.')); for (var i in hp.dns_strategy) so.value(i, hp.dns_strategy[i]); so.modalonly = true; diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js index e02c1b8cd5..c81162ee2c 100644 --- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js +++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js @@ -1,4 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0-only +/* + * SPDX-License-Identifier: GPL-2.0-only * * Copyright (C) 2022-2023 ImmortalWrt.org */ diff --git a/luci-app-homeproxy/po/templates/homeproxy.pot b/luci-app-homeproxy/po/templates/homeproxy.pot index 13f53c0d31..31fb73145b 100644 --- a/luci-app-homeproxy/po/templates/homeproxy.pot +++ b/luci-app-homeproxy/po/templates/homeproxy.pot @@ -1,7 +1,7 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: htdocs/luci-static/resources/view/homeproxy/status.js:158 +#: htdocs/luci-static/resources/view/homeproxy/status.js:159 msgid "%s log" msgstr "" @@ -9,12 +9,12 @@ msgstr "" msgid "%s nodes removed" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:569 -#: htdocs/luci-static/resources/view/homeproxy/client.js:903 +#: htdocs/luci-static/resources/view/homeproxy/client.js:566 +#: htdocs/luci-static/resources/view/homeproxy/client.js:900 msgid "-- Please choose --" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:474 +#: htdocs/luci-static/resources/view/homeproxy/client.js:471 msgid "4 or 6. Not limited if empty." msgstr "" @@ -32,7 +32,7 @@ msgstr "" msgid "Accept any if empty." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1066 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1063 msgid "Access Control" msgstr "" @@ -44,11 +44,11 @@ msgstr "" msgid "Access key secret" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:772 +#: htdocs/luci-static/resources/view/homeproxy/client.js:769 msgid "Add a DNS rule" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:677 +#: htdocs/luci-static/resources/view/homeproxy/client.js:674 msgid "Add a DNS server" msgstr "" @@ -56,15 +56,15 @@ msgstr "" msgid "Add a node" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:364 +#: htdocs/luci-static/resources/view/homeproxy/client.js:361 msgid "Add a routing node" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:440 +#: htdocs/luci-static/resources/view/homeproxy/client.js:437 msgid "Add a routing rule" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:987 +#: htdocs/luci-static/resources/view/homeproxy/client.js:984 msgid "Add a rule set" msgstr "" @@ -72,16 +72,16 @@ msgstr "" msgid "Add a server" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:691 +#: htdocs/luci-static/resources/view/homeproxy/client.js:688 #: htdocs/luci-static/resources/view/homeproxy/node.js:413 msgid "Address" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:695 +#: htdocs/luci-static/resources/view/homeproxy/client.js:692 msgid "Address resolver" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:727 +#: htdocs/luci-static/resources/view/homeproxy/client.js:724 msgid "Address strategy" msgstr "" @@ -116,11 +116,11 @@ msgstr "" msgid "Allowed payload size is in the request." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:94 +#: htdocs/luci-static/resources/view/homeproxy/status.js:95 msgid "Already at the latest version." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:91 +#: htdocs/luci-static/resources/view/homeproxy/status.js:92 msgid "Already in updating." msgstr "" @@ -141,13 +141,13 @@ msgstr "" msgid "An error occurred during updating subscriptions: %s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:929 +#: htdocs/luci-static/resources/view/homeproxy/client.js:926 msgid "Any" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:651 -#: htdocs/luci-static/resources/view/homeproxy/client.js:757 -#: htdocs/luci-static/resources/view/homeproxy/client.js:971 +#: htdocs/luci-static/resources/view/homeproxy/client.js:648 +#: htdocs/luci-static/resources/view/homeproxy/client.js:754 +#: htdocs/luci-static/resources/view/homeproxy/client.js:968 msgid "" "Append a edns0-subnet OPT extra record with the specified IP " "prefix to every query by default.
If value is an IP address instead of " @@ -205,7 +205,7 @@ msgstr "" msgid "BBR" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:193 +#: htdocs/luci-static/resources/view/homeproxy/status.js:194 msgid "BaiDu" msgstr "" @@ -214,20 +214,20 @@ msgstr "" msgid "Base64" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:304 +#: htdocs/luci-static/resources/view/homeproxy/client.js:301 msgid "Based on google/gvisor." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1009 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1006 msgid "Binary file" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:391 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1079 +#: htdocs/luci-static/resources/view/homeproxy/client.js:388 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1076 msgid "Bind interface" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1080 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1077 msgid "" "Bind outbound traffic to specific interface. Leave empty to auto detect." msgstr "" @@ -236,26 +236,26 @@ msgstr "" msgid "Blacklist mode" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:342 -#: htdocs/luci-static/resources/view/homeproxy/client.js:597 -#: htdocs/luci-static/resources/view/homeproxy/client.js:931 +#: htdocs/luci-static/resources/view/homeproxy/client.js:339 +#: htdocs/luci-static/resources/view/homeproxy/client.js:594 +#: htdocs/luci-static/resources/view/homeproxy/client.js:928 msgid "Block" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:627 -#: htdocs/luci-static/resources/view/homeproxy/client.js:949 +#: htdocs/luci-static/resources/view/homeproxy/client.js:624 +#: htdocs/luci-static/resources/view/homeproxy/client.js:946 msgid "Block DNS queries" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:477 -#: htdocs/luci-static/resources/view/homeproxy/client.js:490 -#: htdocs/luci-static/resources/view/homeproxy/client.js:808 -#: htdocs/luci-static/resources/view/homeproxy/client.js:818 +#: htdocs/luci-static/resources/view/homeproxy/client.js:474 +#: htdocs/luci-static/resources/view/homeproxy/client.js:487 +#: htdocs/luci-static/resources/view/homeproxy/client.js:805 +#: htdocs/luci-static/resources/view/homeproxy/client.js:815 #: htdocs/luci-static/resources/view/homeproxy/server.js:802 msgid "Both" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:325 +#: htdocs/luci-static/resources/view/homeproxy/client.js:322 msgid "Bypass CN traffic" msgstr "" @@ -263,7 +263,7 @@ msgstr "" msgid "Bypass mainland China" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:326 +#: htdocs/luci-static/resources/view/homeproxy/client.js:323 msgid "Bypass mainland China traffic via firewall rules by default." msgstr "" @@ -288,11 +288,11 @@ msgstr "" msgid "Certificate path" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:56 +#: htdocs/luci-static/resources/view/homeproxy/status.js:57 msgid "Check" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:104 +#: htdocs/luci-static/resources/view/homeproxy/status.js:105 msgid "Check update" msgstr "" @@ -300,15 +300,15 @@ msgstr "" msgid "China DNS server" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:203 +#: htdocs/luci-static/resources/view/homeproxy/status.js:204 msgid "China IPv4 list version" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:207 +#: htdocs/luci-static/resources/view/homeproxy/status.js:208 msgid "China IPv6 list version" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:211 +#: htdocs/luci-static/resources/view/homeproxy/status.js:212 msgid "China list version" msgstr "" @@ -321,7 +321,7 @@ msgstr "" msgid "Cisco Public DNS (208.67.222.222)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:165 +#: htdocs/luci-static/resources/view/homeproxy/status.js:166 msgid "Clean log" msgstr "" @@ -341,9 +341,9 @@ msgstr "" msgid "Cloudflare" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:122 +#: htdocs/luci-static/resources/view/homeproxy/client.js:133 #: htdocs/luci-static/resources/view/homeproxy/server.js:110 -#: htdocs/luci-static/resources/view/homeproxy/status.js:128 +#: htdocs/luci-static/resources/view/homeproxy/status.js:129 msgid "Collecting data..." msgstr "" @@ -356,7 +356,7 @@ msgstr "" msgid "Congestion control algorithm" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:190 +#: htdocs/luci-static/resources/view/homeproxy/status.js:191 msgid "Connection check" msgstr "" @@ -364,19 +364,19 @@ msgstr "" msgid "Custom routing" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:825 +#: htdocs/luci-static/resources/view/homeproxy/client.js:822 msgid "DNS" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:763 +#: htdocs/luci-static/resources/view/homeproxy/client.js:760 msgid "DNS Rules" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:668 +#: htdocs/luci-static/resources/view/homeproxy/client.js:665 msgid "DNS Servers" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:610 +#: htdocs/luci-static/resources/view/homeproxy/client.js:607 msgid "DNS Settings" msgstr "" @@ -384,12 +384,12 @@ msgstr "" msgid "DNS provider" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:772 +#: htdocs/luci-static/resources/view/homeproxy/client.js:769 msgid "DNS rule" msgstr "" #: htdocs/luci-static/resources/view/homeproxy/client.js:158 -#: htdocs/luci-static/resources/view/homeproxy/client.js:677 +#: htdocs/luci-static/resources/view/homeproxy/client.js:674 msgid "DNS server" msgstr "" @@ -398,31 +398,31 @@ msgid "DNS01 challenge" msgstr "" #: htdocs/luci-static/resources/homeproxy.js:17 -#: htdocs/luci-static/resources/view/homeproxy/client.js:468 -#: htdocs/luci-static/resources/view/homeproxy/client.js:800 +#: htdocs/luci-static/resources/view/homeproxy/client.js:465 +#: htdocs/luci-static/resources/view/homeproxy/client.js:797 #: htdocs/luci-static/resources/view/homeproxy/node.js:645 msgid "Default" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:625 -#: htdocs/luci-static/resources/view/homeproxy/client.js:702 -#: htdocs/luci-static/resources/view/homeproxy/client.js:947 +#: htdocs/luci-static/resources/view/homeproxy/client.js:622 +#: htdocs/luci-static/resources/view/homeproxy/client.js:699 +#: htdocs/luci-static/resources/view/homeproxy/client.js:944 msgid "Default DNS (issued by WAN)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:620 +#: htdocs/luci-static/resources/view/homeproxy/client.js:617 msgid "Default DNS server" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:615 +#: htdocs/luci-static/resources/view/homeproxy/client.js:612 msgid "Default DNS strategy" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:734 +#: htdocs/luci-static/resources/view/homeproxy/client.js:731 msgid "Default domain strategy for resolving the domain names." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:335 +#: htdocs/luci-static/resources/view/homeproxy/client.js:332 msgid "Default outbound" msgstr "" @@ -434,38 +434,38 @@ msgstr "" msgid "Default server name" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:341 -#: htdocs/luci-static/resources/view/homeproxy/client.js:404 -#: htdocs/luci-static/resources/view/homeproxy/client.js:596 -#: htdocs/luci-static/resources/view/homeproxy/client.js:744 -#: htdocs/luci-static/resources/view/homeproxy/client.js:930 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1048 +#: htdocs/luci-static/resources/view/homeproxy/client.js:338 +#: htdocs/luci-static/resources/view/homeproxy/client.js:401 +#: htdocs/luci-static/resources/view/homeproxy/client.js:593 +#: htdocs/luci-static/resources/view/homeproxy/client.js:741 +#: htdocs/luci-static/resources/view/homeproxy/client.js:927 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1045 #: htdocs/luci-static/resources/view/homeproxy/node.js:394 msgid "Direct" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1178 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1175 msgid "Direct Domain List" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1095 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1140 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1092 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1137 msgid "Direct IPv4 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1098 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1143 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1095 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1140 msgid "Direct IPv6 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1101 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1098 msgid "Direct MAC-s" msgstr "" #: htdocs/luci-static/resources/view/homeproxy/client.js:142 #: htdocs/luci-static/resources/view/homeproxy/client.js:150 -#: htdocs/luci-static/resources/view/homeproxy/client.js:340 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1089 +#: htdocs/luci-static/resources/view/homeproxy/client.js:337 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1086 #: htdocs/luci-static/resources/view/homeproxy/node.js:473 #: htdocs/luci-static/resources/view/homeproxy/node.js:492 #: htdocs/luci-static/resources/view/homeproxy/node.js:504 @@ -476,7 +476,7 @@ msgstr "" msgid "Disable" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:638 +#: htdocs/luci-static/resources/view/homeproxy/client.js:635 msgid "Disable DNS cache" msgstr "" @@ -493,15 +493,15 @@ msgstr "" msgid "Disable TLS ALPN challenge" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:961 +#: htdocs/luci-static/resources/view/homeproxy/client.js:958 msgid "Disable cache and save cache in this query." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:641 +#: htdocs/luci-static/resources/view/homeproxy/client.js:638 msgid "Disable cache expire" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:960 +#: htdocs/luci-static/resources/view/homeproxy/client.js:957 msgid "Disable dns cache" msgstr "" @@ -516,28 +516,28 @@ msgid "" "(IPv4) / 1232 (IPv6) bytes in size." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:501 -#: htdocs/luci-static/resources/view/homeproxy/client.js:837 +#: htdocs/luci-static/resources/view/homeproxy/client.js:498 +#: htdocs/luci-static/resources/view/homeproxy/client.js:834 msgid "Domain keyword" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:492 -#: htdocs/luci-static/resources/view/homeproxy/client.js:828 +#: htdocs/luci-static/resources/view/homeproxy/client.js:489 +#: htdocs/luci-static/resources/view/homeproxy/client.js:825 msgid "Domain name" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:505 -#: htdocs/luci-static/resources/view/homeproxy/client.js:841 +#: htdocs/luci-static/resources/view/homeproxy/client.js:502 +#: htdocs/luci-static/resources/view/homeproxy/client.js:838 msgid "Domain regex" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:385 +#: htdocs/luci-static/resources/view/homeproxy/client.js:382 #: htdocs/luci-static/resources/view/homeproxy/server.js:793 msgid "Domain strategy" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:497 -#: htdocs/luci-static/resources/view/homeproxy/client.js:833 +#: htdocs/luci-static/resources/view/homeproxy/client.js:494 +#: htdocs/luci-static/resources/view/homeproxy/client.js:830 msgid "Domain suffix" msgstr "" @@ -584,9 +584,9 @@ msgstr "" msgid "ECH config" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:650 -#: htdocs/luci-static/resources/view/homeproxy/client.js:756 -#: htdocs/luci-static/resources/view/homeproxy/client.js:970 +#: htdocs/luci-static/resources/view/homeproxy/client.js:647 +#: htdocs/luci-static/resources/view/homeproxy/client.js:753 +#: htdocs/luci-static/resources/view/homeproxy/client.js:967 msgid "EDNS Client subnet" msgstr "" @@ -612,11 +612,11 @@ msgstr "" msgid "Email" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:373 -#: htdocs/luci-static/resources/view/homeproxy/client.js:455 -#: htdocs/luci-static/resources/view/homeproxy/client.js:686 -#: htdocs/luci-static/resources/view/homeproxy/client.js:787 -#: htdocs/luci-static/resources/view/homeproxy/client.js:996 +#: htdocs/luci-static/resources/view/homeproxy/client.js:370 +#: htdocs/luci-static/resources/view/homeproxy/client.js:452 +#: htdocs/luci-static/resources/view/homeproxy/client.js:683 +#: htdocs/luci-static/resources/view/homeproxy/client.js:784 +#: htdocs/luci-static/resources/view/homeproxy/client.js:993 #: htdocs/luci-static/resources/view/homeproxy/server.js:116 #: htdocs/luci-static/resources/view/homeproxy/server.js:139 msgid "Enable" @@ -662,7 +662,7 @@ msgstr "" msgid "Enable UDP fragmentation." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:309 +#: htdocs/luci-static/resources/view/homeproxy/client.js:306 msgid "Enable endpoint-independent NAT" msgstr "" @@ -696,13 +696,12 @@ msgstr "" #: htdocs/luci-static/resources/view/homeproxy/client.js:176 #: htdocs/luci-static/resources/view/homeproxy/client.js:178 #: htdocs/luci-static/resources/view/homeproxy/client.js:206 -#: htdocs/luci-static/resources/view/homeproxy/client.js:244 -#: htdocs/luci-static/resources/view/homeproxy/client.js:249 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1024 +#: htdocs/luci-static/resources/view/homeproxy/client.js:246 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1021 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1026 #: htdocs/luci-static/resources/view/homeproxy/client.js:1029 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1032 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1171 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1200 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1168 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1197 #: htdocs/luci-static/resources/view/homeproxy/node.js:452 #: htdocs/luci-static/resources/view/homeproxy/node.js:1082 #: htdocs/luci-static/resources/view/homeproxy/node.js:1255 @@ -743,7 +742,7 @@ msgstr "" msgid "Flow" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1007 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1004 msgid "Format" msgstr "" @@ -751,7 +750,7 @@ msgstr "" msgid "GET" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:215 +#: htdocs/luci-static/resources/view/homeproxy/status.js:216 msgid "GFW list version" msgstr "" @@ -759,15 +758,15 @@ msgstr "" msgid "GFWList" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1113 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1110 msgid "Gaming mode IPv4 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1115 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1112 msgid "Gaming mode IPv6 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1118 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1115 msgid "Gaming mode MAC-s" msgstr "" @@ -778,7 +777,7 @@ msgstr "" msgid "Generate" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:282 +#: htdocs/luci-static/resources/view/homeproxy/client.js:279 #: htdocs/luci-static/resources/view/homeproxy/node.js:835 msgid "Generic segmentation offload" msgstr "" @@ -791,15 +790,15 @@ msgstr "" msgid "Global padding" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1120 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1117 msgid "Global proxy IPv4 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1123 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1120 msgid "Global proxy IPv6 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1126 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1123 msgid "Global proxy MAC-s" msgstr "" @@ -807,7 +806,7 @@ msgstr "" msgid "Global settings" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:196 +#: htdocs/luci-static/resources/view/homeproxy/status.js:197 msgid "Google" msgstr "" @@ -819,8 +818,8 @@ msgstr "" msgid "Grant access to homeproxy configuration" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:482 -#: htdocs/luci-static/resources/view/homeproxy/client.js:822 +#: htdocs/luci-static/resources/view/homeproxy/client.js:479 +#: htdocs/luci-static/resources/view/homeproxy/client.js:819 #: htdocs/luci-static/resources/view/homeproxy/node.js:395 #: htdocs/luci-static/resources/view/homeproxy/node.js:715 #: htdocs/luci-static/resources/view/homeproxy/server.js:145 @@ -854,8 +853,8 @@ msgstr "" #: htdocs/luci-static/resources/view/homeproxy/client.js:55 #: htdocs/luci-static/resources/view/homeproxy/client.js:57 -#: htdocs/luci-static/resources/view/homeproxy/client.js:109 -#: htdocs/luci-static/resources/view/homeproxy/status.js:223 +#: htdocs/luci-static/resources/view/homeproxy/client.js:120 +#: htdocs/luci-static/resources/view/homeproxy/status.js:224 #: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3 msgid "HomeProxy" msgstr "" @@ -875,8 +874,8 @@ msgstr "" msgid "Host" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:445 -#: htdocs/luci-static/resources/view/homeproxy/client.js:777 +#: htdocs/luci-static/resources/view/homeproxy/client.js:442 +#: htdocs/luci-static/resources/view/homeproxy/client.js:774 msgid "Host fields" msgstr "" @@ -904,18 +903,18 @@ msgstr "" msgid "Hysteria2" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:520 -#: htdocs/luci-static/resources/view/homeproxy/client.js:865 +#: htdocs/luci-static/resources/view/homeproxy/client.js:517 +#: htdocs/luci-static/resources/view/homeproxy/client.js:862 msgid "IP CIDR" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:473 -#: htdocs/luci-static/resources/view/homeproxy/client.js:805 +#: htdocs/luci-static/resources/view/homeproxy/client.js:470 +#: htdocs/luci-static/resources/view/homeproxy/client.js:802 msgid "IP version" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:475 -#: htdocs/luci-static/resources/view/homeproxy/client.js:806 +#: htdocs/luci-static/resources/view/homeproxy/client.js:472 +#: htdocs/luci-static/resources/view/homeproxy/client.js:803 msgid "IPv4" msgstr "" @@ -923,8 +922,8 @@ msgstr "" msgid "IPv4 only" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:476 -#: htdocs/luci-static/resources/view/homeproxy/client.js:807 +#: htdocs/luci-static/resources/view/homeproxy/client.js:473 +#: htdocs/luci-static/resources/view/homeproxy/client.js:804 msgid "IPv6" msgstr "" @@ -932,7 +931,7 @@ msgstr "" msgid "IPv6 only" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:272 +#: htdocs/luci-static/resources/view/homeproxy/client.js:269 msgid "IPv6 support" msgstr "" @@ -952,10 +951,9 @@ msgid "" "If set, the requested domain name will be resolved to IP before routing." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:386 +#: htdocs/luci-static/resources/view/homeproxy/client.js:383 msgid "" -"If set, the server domain name will be resolved to IP before connecting.
dns.strategy will be used if empty." +"If set, the server domain name will be resolved to IP before connecting.
" msgstr "" #: htdocs/luci-static/resources/view/homeproxy/node.js:742 @@ -985,16 +983,16 @@ msgstr "" msgid "Import share links" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:317 +#: htdocs/luci-static/resources/view/homeproxy/client.js:314 #: htdocs/luci-static/resources/view/homeproxy/server.js:783 msgid "In seconds. 300 is used by default." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:645 +#: htdocs/luci-static/resources/view/homeproxy/client.js:642 msgid "Independent cache per server" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1072 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1069 msgid "Interface Control" msgstr "" @@ -1005,13 +1003,13 @@ msgid "" "seconds)." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:585 -#: htdocs/luci-static/resources/view/homeproxy/client.js:918 +#: htdocs/luci-static/resources/view/homeproxy/client.js:582 +#: htdocs/luci-static/resources/view/homeproxy/client.js:915 msgid "Invert" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:586 -#: htdocs/luci-static/resources/view/homeproxy/client.js:919 +#: htdocs/luci-static/resources/view/homeproxy/client.js:583 +#: htdocs/luci-static/resources/view/homeproxy/client.js:916 msgid "Invert match result." msgstr "" @@ -1023,15 +1021,15 @@ msgstr "" msgid "Key path" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1086 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1083 msgid "LAN IP Policy" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:368 -#: htdocs/luci-static/resources/view/homeproxy/client.js:450 -#: htdocs/luci-static/resources/view/homeproxy/client.js:681 -#: htdocs/luci-static/resources/view/homeproxy/client.js:782 -#: htdocs/luci-static/resources/view/homeproxy/client.js:991 +#: htdocs/luci-static/resources/view/homeproxy/client.js:365 +#: htdocs/luci-static/resources/view/homeproxy/client.js:447 +#: htdocs/luci-static/resources/view/homeproxy/client.js:678 +#: htdocs/luci-static/resources/view/homeproxy/client.js:779 +#: htdocs/luci-static/resources/view/homeproxy/client.js:988 #: htdocs/luci-static/resources/view/homeproxy/node.js:388 #: htdocs/luci-static/resources/view/homeproxy/server.js:133 msgid "Label" @@ -1044,7 +1042,7 @@ msgid "" "compatibility purposes only, use of alterId > 1 is not recommended." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:306 +#: htdocs/luci-static/resources/view/homeproxy/client.js:303 msgid "Less compatibility and sometimes better performance." msgstr "" @@ -1066,7 +1064,7 @@ msgstr "" msgid "Listen address" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1074 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1071 msgid "Listen interfaces" msgstr "" @@ -1074,11 +1072,11 @@ msgstr "" msgid "Listen port" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:126 +#: htdocs/luci-static/resources/view/homeproxy/status.js:127 msgid "Loading" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1002 +#: htdocs/luci-static/resources/view/homeproxy/client.js:999 msgid "Local" msgstr "" @@ -1086,11 +1084,11 @@ msgstr "" msgid "Local address" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:143 +#: htdocs/luci-static/resources/view/homeproxy/status.js:144 msgid "Log file does not exist." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:136 +#: htdocs/luci-static/resources/view/homeproxy/status.js:137 msgid "Log is empty." msgstr "" @@ -1106,15 +1104,15 @@ msgstr "" msgid "Main node" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:914 +#: htdocs/luci-static/resources/view/homeproxy/client.js:911 msgid "Make ipcidr in rule sets match the source IP." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:580 +#: htdocs/luci-static/resources/view/homeproxy/client.js:577 msgid "Make IP CIDR in rule set used to match the source IP." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:646 +#: htdocs/luci-static/resources/view/homeproxy/client.js:643 msgid "" "Make each DNS server's cache independent for special purposes. If enabled, " "will slightly degrade performance." @@ -1124,101 +1122,101 @@ msgstr "" msgid "Masquerade" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:924 +#: htdocs/luci-static/resources/view/homeproxy/client.js:921 msgid "Match .outbounds[].server domains." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:866 +#: htdocs/luci-static/resources/view/homeproxy/client.js:863 msgid "Match IP CIDR with query response." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:521 +#: htdocs/luci-static/resources/view/homeproxy/client.js:518 msgid "Match IP CIDR." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:498 -#: htdocs/luci-static/resources/view/homeproxy/client.js:834 +#: htdocs/luci-static/resources/view/homeproxy/client.js:495 +#: htdocs/luci-static/resources/view/homeproxy/client.js:831 msgid "Match domain suffix." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:502 -#: htdocs/luci-static/resources/view/homeproxy/client.js:838 +#: htdocs/luci-static/resources/view/homeproxy/client.js:499 +#: htdocs/luci-static/resources/view/homeproxy/client.js:835 msgid "Match domain using keyword." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:506 -#: htdocs/luci-static/resources/view/homeproxy/client.js:842 +#: htdocs/luci-static/resources/view/homeproxy/client.js:503 +#: htdocs/luci-static/resources/view/homeproxy/client.js:839 msgid "Match domain using regular expression." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:493 -#: htdocs/luci-static/resources/view/homeproxy/client.js:829 +#: htdocs/luci-static/resources/view/homeproxy/client.js:490 +#: htdocs/luci-static/resources/view/homeproxy/client.js:826 msgid "Match full domain." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:547 -#: htdocs/luci-static/resources/view/homeproxy/client.js:851 +#: htdocs/luci-static/resources/view/homeproxy/client.js:544 +#: htdocs/luci-static/resources/view/homeproxy/client.js:848 msgid "Match port range. Format as START:/:END/START:END." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:542 -#: htdocs/luci-static/resources/view/homeproxy/client.js:846 +#: htdocs/luci-static/resources/view/homeproxy/client.js:539 +#: htdocs/luci-static/resources/view/homeproxy/client.js:843 msgid "Match port." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:871 +#: htdocs/luci-static/resources/view/homeproxy/client.js:868 msgid "Match private IP with query response." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:526 +#: htdocs/luci-static/resources/view/homeproxy/client.js:523 msgid "Match private IP." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:515 -#: htdocs/luci-static/resources/view/homeproxy/client.js:861 +#: htdocs/luci-static/resources/view/homeproxy/client.js:512 +#: htdocs/luci-static/resources/view/homeproxy/client.js:858 msgid "Match private source IP." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:552 -#: htdocs/luci-static/resources/view/homeproxy/client.js:886 +#: htdocs/luci-static/resources/view/homeproxy/client.js:549 +#: htdocs/luci-static/resources/view/homeproxy/client.js:883 msgid "Match process name." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:556 -#: htdocs/luci-static/resources/view/homeproxy/client.js:890 +#: htdocs/luci-static/resources/view/homeproxy/client.js:553 +#: htdocs/luci-static/resources/view/homeproxy/client.js:887 msgid "Match process path." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:812 +#: htdocs/luci-static/resources/view/homeproxy/client.js:809 msgid "Match query type." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:564 -#: htdocs/luci-static/resources/view/homeproxy/client.js:898 +#: htdocs/luci-static/resources/view/homeproxy/client.js:561 +#: htdocs/luci-static/resources/view/homeproxy/client.js:895 msgid "Match rule set." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:510 -#: htdocs/luci-static/resources/view/homeproxy/client.js:856 +#: htdocs/luci-static/resources/view/homeproxy/client.js:507 +#: htdocs/luci-static/resources/view/homeproxy/client.js:853 msgid "Match source IP CIDR." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:579 +#: htdocs/luci-static/resources/view/homeproxy/client.js:576 msgid "Match source IP via rule set" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:537 -#: htdocs/luci-static/resources/view/homeproxy/client.js:881 +#: htdocs/luci-static/resources/view/homeproxy/client.js:534 +#: htdocs/luci-static/resources/view/homeproxy/client.js:878 msgid "Match source port range. Format as START:/:END/START:END." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:532 -#: htdocs/luci-static/resources/view/homeproxy/client.js:876 +#: htdocs/luci-static/resources/view/homeproxy/client.js:529 +#: htdocs/luci-static/resources/view/homeproxy/client.js:873 msgid "Match source port." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:560 -#: htdocs/luci-static/resources/view/homeproxy/client.js:894 +#: htdocs/luci-static/resources/view/homeproxy/client.js:557 +#: htdocs/luci-static/resources/view/homeproxy/client.js:891 msgid "Match user name." msgstr "" @@ -1285,16 +1283,16 @@ msgstr "" msgid "Minimum streams" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:291 +#: htdocs/luci-static/resources/view/homeproxy/client.js:288 msgid "Mixed" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:302 +#: htdocs/luci-static/resources/view/homeproxy/client.js:299 msgid "Mixed system TCP stack and gVisor UDP stack." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:460 -#: htdocs/luci-static/resources/view/homeproxy/client.js:792 +#: htdocs/luci-static/resources/view/homeproxy/client.js:457 +#: htdocs/luci-static/resources/view/homeproxy/client.js:789 msgid "Mode" msgstr "" @@ -1329,8 +1327,8 @@ msgstr "" msgid "NaïveProxy" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:487 -#: htdocs/luci-static/resources/view/homeproxy/client.js:815 +#: htdocs/luci-static/resources/view/homeproxy/client.js:484 +#: htdocs/luci-static/resources/view/homeproxy/client.js:812 #: htdocs/luci-static/resources/view/homeproxy/server.js:799 msgid "Network" msgstr "" @@ -1363,7 +1361,7 @@ msgstr "" msgid "No valid share link found." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:378 +#: htdocs/luci-static/resources/view/homeproxy/client.js:375 #: htdocs/luci-static/resources/view/homeproxy/node.js:363 msgid "Node" msgstr "" @@ -1376,7 +1374,7 @@ msgstr "" msgid "Nodes" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:701 +#: htdocs/luci-static/resources/view/homeproxy/client.js:698 #: htdocs/luci-static/resources/view/homeproxy/node.js:674 #: htdocs/luci-static/resources/view/homeproxy/node.js:713 #: htdocs/luci-static/resources/view/homeproxy/server.js:367 @@ -1394,7 +1392,7 @@ msgstr "" msgid "Obfuscate type" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1075 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1072 msgid "Only process traffic from specific interfaces. Leave empty for all." msgstr "" @@ -1402,20 +1400,20 @@ msgstr "" msgid "Only proxy mainland China" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:444 -#: htdocs/luci-static/resources/view/homeproxy/client.js:776 +#: htdocs/luci-static/resources/view/homeproxy/client.js:441 +#: htdocs/luci-static/resources/view/homeproxy/client.js:773 msgid "Other fields" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:398 -#: htdocs/luci-static/resources/view/homeproxy/client.js:590 -#: htdocs/luci-static/resources/view/homeproxy/client.js:738 -#: htdocs/luci-static/resources/view/homeproxy/client.js:923 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1042 +#: htdocs/luci-static/resources/view/homeproxy/client.js:395 +#: htdocs/luci-static/resources/view/homeproxy/client.js:587 +#: htdocs/luci-static/resources/view/homeproxy/client.js:735 +#: htdocs/luci-static/resources/view/homeproxy/client.js:920 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1039 msgid "Outbound" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:379 +#: htdocs/luci-static/resources/view/homeproxy/client.js:376 msgid "Outbound node" msgstr "" @@ -1423,7 +1421,7 @@ msgstr "" msgid "Override address" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:330 +#: htdocs/luci-static/resources/view/homeproxy/client.js:327 #: htdocs/luci-static/resources/view/homeproxy/server.js:789 msgid "Override destination" msgstr "" @@ -1432,7 +1430,7 @@ msgstr "" msgid "Override port" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:331 +#: htdocs/luci-static/resources/view/homeproxy/client.js:328 #: htdocs/luci-static/resources/view/homeproxy/server.js:790 msgid "Override the connection destination address with the sniffed domain." msgstr "" @@ -1458,7 +1456,7 @@ msgstr "" msgid "Password" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1013 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1010 #: htdocs/luci-static/resources/view/homeproxy/node.js:775 #: htdocs/luci-static/resources/view/homeproxy/node.js:808 #: htdocs/luci-static/resources/view/homeproxy/server.js:428 @@ -1470,7 +1468,7 @@ msgstr "" msgid "Peer pubkic key" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:310 +#: htdocs/luci-static/resources/view/homeproxy/client.js:307 msgid "" "Performance may degrade slightly, so it is not recommended to enable on when " "it is not needed." @@ -1489,23 +1487,23 @@ msgstr "" msgid "Plugin opts" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:541 -#: htdocs/luci-static/resources/view/homeproxy/client.js:845 +#: htdocs/luci-static/resources/view/homeproxy/client.js:538 +#: htdocs/luci-static/resources/view/homeproxy/client.js:842 #: htdocs/luci-static/resources/view/homeproxy/node.js:418 msgid "Port" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:251 +#: htdocs/luci-static/resources/view/homeproxy/client.js:248 msgid "Port %s alrealy exists!" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:446 -#: htdocs/luci-static/resources/view/homeproxy/client.js:778 +#: htdocs/luci-static/resources/view/homeproxy/client.js:443 +#: htdocs/luci-static/resources/view/homeproxy/client.js:775 msgid "Port fields" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:546 -#: htdocs/luci-static/resources/view/homeproxy/client.js:850 +#: htdocs/luci-static/resources/view/homeproxy/client.js:543 +#: htdocs/luci-static/resources/view/homeproxy/client.js:847 msgid "Port range" msgstr "" @@ -1521,8 +1519,8 @@ msgstr "" msgid "Prefer IPv6" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:525 -#: htdocs/luci-static/resources/view/homeproxy/client.js:870 +#: htdocs/luci-static/resources/view/homeproxy/client.js:522 +#: htdocs/luci-static/resources/view/homeproxy/client.js:867 msgid "Private IP" msgstr "" @@ -1535,23 +1533,23 @@ msgstr "" msgid "Private key passphrase" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:514 -#: htdocs/luci-static/resources/view/homeproxy/client.js:860 +#: htdocs/luci-static/resources/view/homeproxy/client.js:511 +#: htdocs/luci-static/resources/view/homeproxy/client.js:857 msgid "Private source IP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:551 -#: htdocs/luci-static/resources/view/homeproxy/client.js:885 +#: htdocs/luci-static/resources/view/homeproxy/client.js:548 +#: htdocs/luci-static/resources/view/homeproxy/client.js:882 msgid "Process name" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:555 -#: htdocs/luci-static/resources/view/homeproxy/client.js:889 +#: htdocs/luci-static/resources/view/homeproxy/client.js:552 +#: htdocs/luci-static/resources/view/homeproxy/client.js:886 msgid "Process path" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:480 -#: htdocs/luci-static/resources/view/homeproxy/client.js:820 +#: htdocs/luci-static/resources/view/homeproxy/client.js:477 +#: htdocs/luci-static/resources/view/homeproxy/client.js:817 #: htdocs/luci-static/resources/view/homeproxy/node.js:480 #: htdocs/luci-static/resources/view/homeproxy/node.js:892 #: htdocs/luci-static/resources/view/homeproxy/server.js:220 @@ -1568,37 +1566,37 @@ msgid "" "default in v2ray and cannot be disabled)." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1149 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1146 msgid "Proxy Domain List" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1104 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1133 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1101 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1130 msgid "Proxy IPv4 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1107 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1136 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1104 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1133 msgid "Proxy IPv6 IP-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1110 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1107 msgid "Proxy MAC-s" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1091 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1088 msgid "Proxy all except listed" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1088 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1085 msgid "Proxy filter mode" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1090 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1087 msgid "Proxy listed only" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:259 +#: htdocs/luci-static/resources/view/homeproxy/client.js:256 msgid "Proxy mode" msgstr "" @@ -1606,8 +1604,8 @@ msgstr "" msgid "Proxy protocol" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:484 -#: htdocs/luci-static/resources/view/homeproxy/client.js:824 +#: htdocs/luci-static/resources/view/homeproxy/client.js:481 +#: htdocs/luci-static/resources/view/homeproxy/client.js:821 #: htdocs/luci-static/resources/view/homeproxy/node.js:647 #: htdocs/luci-static/resources/view/homeproxy/node.js:717 #: htdocs/luci-static/resources/view/homeproxy/server.js:386 @@ -1633,11 +1631,11 @@ msgstr "" msgid "QUIC stream receive window" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:811 +#: htdocs/luci-static/resources/view/homeproxy/client.js:808 msgid "Query type" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:661 +#: htdocs/luci-static/resources/view/homeproxy/client.js:658 msgid "RDRC timeout" msgstr "" @@ -1668,27 +1666,27 @@ msgstr "" msgid "Random version will be used if empty." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:423 +#: htdocs/luci-static/resources/view/homeproxy/client.js:420 msgid "Recursive outbound detected!" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:720 +#: htdocs/luci-static/resources/view/homeproxy/client.js:717 msgid "Recursive resolver detected!" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:260 +#: htdocs/luci-static/resources/view/homeproxy/client.js:257 msgid "Redirect TCP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:262 +#: htdocs/luci-static/resources/view/homeproxy/client.js:259 msgid "Redirect TCP + TProxy UDP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:264 +#: htdocs/luci-static/resources/view/homeproxy/client.js:261 msgid "Redirect TCP + Tun UDP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:170 +#: htdocs/luci-static/resources/view/homeproxy/status.js:171 msgid "Refresh every %s seconds." msgstr "" @@ -1696,7 +1694,7 @@ msgstr "" msgid "Region ID" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1003 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1000 msgid "Remote" msgstr "" @@ -1712,27 +1710,27 @@ msgstr "" msgid "Reserved field bytes" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:733 +#: htdocs/luci-static/resources/view/homeproxy/client.js:730 msgid "Resolve strategy" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:200 +#: htdocs/luci-static/resources/view/homeproxy/status.js:201 msgid "Resources management" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:965 +#: htdocs/luci-static/resources/view/homeproxy/client.js:962 msgid "Rewrite TTL" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:966 +#: htdocs/luci-static/resources/view/homeproxy/client.js:963 msgid "Rewrite TTL in DNS responses." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:355 +#: htdocs/luci-static/resources/view/homeproxy/client.js:352 msgid "Routing Nodes" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:431 +#: htdocs/luci-static/resources/view/homeproxy/client.js:428 msgid "Routing Rules" msgstr "" @@ -1744,7 +1742,7 @@ msgstr "" msgid "Routing mode" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:364 +#: htdocs/luci-static/resources/view/homeproxy/client.js:361 msgid "Routing node" msgstr "" @@ -1752,32 +1750,32 @@ msgstr "" msgid "Routing ports" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:440 +#: htdocs/luci-static/resources/view/homeproxy/client.js:437 msgid "Routing rule" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:563 -#: htdocs/luci-static/resources/view/homeproxy/client.js:897 -#: htdocs/luci-static/resources/view/homeproxy/client.js:978 -#: htdocs/luci-static/resources/view/homeproxy/client.js:987 +#: htdocs/luci-static/resources/view/homeproxy/client.js:560 +#: htdocs/luci-static/resources/view/homeproxy/client.js:894 +#: htdocs/luci-static/resources/view/homeproxy/client.js:975 +#: htdocs/luci-static/resources/view/homeproxy/client.js:984 msgid "Rule set" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:913 +#: htdocs/luci-static/resources/view/homeproxy/client.js:910 msgid "Rule set IP CIDR as source IP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1020 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1017 msgid "Rule set URL" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:447 -#: htdocs/luci-static/resources/view/homeproxy/client.js:779 +#: htdocs/luci-static/resources/view/homeproxy/client.js:444 +#: htdocs/luci-static/resources/view/homeproxy/client.js:776 msgid "SRC-IP fields" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:448 -#: htdocs/luci-static/resources/view/homeproxy/client.js:780 +#: htdocs/luci-static/resources/view/homeproxy/client.js:445 +#: htdocs/luci-static/resources/view/homeproxy/client.js:777 msgid "SRC-Port fields" msgstr "" @@ -1785,8 +1783,8 @@ msgstr "" msgid "SSH" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:485 -#: htdocs/luci-static/resources/view/homeproxy/client.js:826 +#: htdocs/luci-static/resources/view/homeproxy/client.js:482 +#: htdocs/luci-static/resources/view/homeproxy/client.js:823 msgid "STUN" msgstr "" @@ -1811,7 +1809,7 @@ msgstr "" msgid "Save subscriptions settings" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:941 +#: htdocs/luci-static/resources/view/homeproxy/client.js:938 #: htdocs/luci-static/resources/view/homeproxy/server.js:129 msgid "Server" msgstr "" @@ -1847,8 +1845,8 @@ msgstr "" msgid "Shadowsocks" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:481 -#: htdocs/luci-static/resources/view/homeproxy/client.js:821 +#: htdocs/luci-static/resources/view/homeproxy/client.js:478 +#: htdocs/luci-static/resources/view/homeproxy/client.js:818 msgid "" "Sniffed protocol, see Sniff for details." @@ -1875,22 +1873,22 @@ msgstr "" msgid "Socks5" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:509 -#: htdocs/luci-static/resources/view/homeproxy/client.js:855 +#: htdocs/luci-static/resources/view/homeproxy/client.js:506 +#: htdocs/luci-static/resources/view/homeproxy/client.js:852 msgid "Source IP CIDR" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1008 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1005 msgid "Source file" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:531 -#: htdocs/luci-static/resources/view/homeproxy/client.js:875 +#: htdocs/luci-static/resources/view/homeproxy/client.js:528 +#: htdocs/luci-static/resources/view/homeproxy/client.js:872 msgid "Source port" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:536 -#: htdocs/luci-static/resources/view/homeproxy/client.js:880 +#: htdocs/luci-static/resources/view/homeproxy/client.js:533 +#: htdocs/luci-static/resources/view/homeproxy/client.js:877 msgid "Source port range" msgstr "" @@ -1926,11 +1924,11 @@ msgid "" "commas." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:655 +#: htdocs/luci-static/resources/view/homeproxy/client.js:652 msgid "Store RDRC" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:656 +#: htdocs/luci-static/resources/view/homeproxy/client.js:653 msgid "" "Store rejected DNS response cache.
The check results of Address " "filter DNS rule items will be cached until expiration." @@ -1957,7 +1955,7 @@ msgstr "" msgid "Successfully imported %s nodes of total %s." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:85 +#: htdocs/luci-static/resources/view/homeproxy/status.js:86 msgid "Successfully updated." msgstr "" @@ -1968,18 +1966,18 @@ msgid "" "online configuration delivery standard." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:294 +#: htdocs/luci-static/resources/view/homeproxy/client.js:291 msgid "System" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:626 -#: htdocs/luci-static/resources/view/homeproxy/client.js:703 -#: htdocs/luci-static/resources/view/homeproxy/client.js:948 +#: htdocs/luci-static/resources/view/homeproxy/client.js:623 +#: htdocs/luci-static/resources/view/homeproxy/client.js:700 +#: htdocs/luci-static/resources/view/homeproxy/client.js:945 msgid "System DNS" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:488 -#: htdocs/luci-static/resources/view/homeproxy/client.js:816 +#: htdocs/luci-static/resources/view/homeproxy/client.js:485 +#: htdocs/luci-static/resources/view/homeproxy/client.js:813 #: htdocs/luci-static/resources/view/homeproxy/server.js:800 msgid "TCP" msgstr "" @@ -1989,16 +1987,16 @@ msgstr "" msgid "TCP fast open" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:288 +#: htdocs/luci-static/resources/view/homeproxy/client.js:285 msgid "TCP/IP stack" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:289 +#: htdocs/luci-static/resources/view/homeproxy/client.js:286 msgid "TCP/IP stack." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:483 -#: htdocs/luci-static/resources/view/homeproxy/client.js:823 +#: htdocs/luci-static/resources/view/homeproxy/client.js:480 +#: htdocs/luci-static/resources/view/homeproxy/client.js:820 #: htdocs/luci-static/resources/view/homeproxy/node.js:945 #: htdocs/luci-static/resources/view/homeproxy/server.js:516 msgid "TLS" @@ -2019,25 +2017,25 @@ msgstr "" msgid "TLS is not enforced. If TLS is not configured, plain HTTP 1.1 is used." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:696 +#: htdocs/luci-static/resources/view/homeproxy/client.js:693 msgid "" "Tag of a another server to resolve the domain name in the address. Required " "if address contains domain." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:739 +#: htdocs/luci-static/resources/view/homeproxy/client.js:736 msgid "Tag of an outbound for connecting to the dns server." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1043 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1040 msgid "Tag of the outbound to download rule set." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:942 +#: htdocs/luci-static/resources/view/homeproxy/client.js:939 msgid "Tag of the target dns server." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:591 +#: htdocs/luci-static/resources/view/homeproxy/client.js:588 msgid "Tag of the target outbound." msgstr "" @@ -2055,7 +2053,7 @@ msgstr "" msgid "The ACME CA provider to use." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:616 +#: htdocs/luci-static/resources/view/homeproxy/client.js:613 msgid "The DNS strategy for resolving the domain name in the address." msgstr "" @@ -2069,7 +2067,7 @@ msgstr "" msgid "The QUIC stream-level flow control window for receiving data." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:692 +#: htdocs/luci-static/resources/view/homeproxy/client.js:689 msgid "The address of the dns server. Support UDP, TCP, DoT, DoH and RCode." msgstr "" @@ -2085,7 +2083,7 @@ msgid "" "forward 443 to this port for challenge to succeed." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:461 +#: htdocs/luci-static/resources/view/homeproxy/client.js:458 msgid "" "The default rule uses the following matching logic:
(domain || " "domain_suffix || domain_keyword || domain_regex || ip_cidr || " @@ -2096,7 +2094,7 @@ msgid "" "than as a single rule sub-item." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:793 +#: htdocs/luci-static/resources/view/homeproxy/client.js:790 msgid "" "The default rule uses the following matching logic:
(domain || " "domain_suffix || domain_keyword || domain_regex) &&
(port " @@ -2106,10 +2104,8 @@ msgid "" "considered merged rather than as a single rule sub-item." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:728 -msgid "" -"The domain strategy for resolving the domain name in the address. dns." -"strategy will be used if empty." +#: htdocs/luci-static/resources/view/homeproxy/client.js:725 +msgid "The domain strategy for resolving the domain name in the address." msgstr "" #: htdocs/luci-static/resources/view/homeproxy/node.js:1008 @@ -2145,12 +2141,12 @@ msgstr "" msgid "The minimum TLS version that is acceptable." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:110 +#: htdocs/luci-static/resources/view/homeproxy/client.js:121 #: htdocs/luci-static/resources/view/homeproxy/server.js:98 msgid "The modern ImmortalWrt proxy platform for ARM64/AMD64." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:392 +#: htdocs/luci-static/resources/view/homeproxy/client.js:389 msgid "The network interface to bind to." msgstr "" @@ -2170,7 +2166,7 @@ msgstr "" msgid "The server public key, in PEM format." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:399 +#: htdocs/luci-static/resources/view/homeproxy/client.js:396 msgid "" "The tag of the upstream outbound.
Other dial fields will be ignored when " "enabled." @@ -2202,7 +2198,7 @@ msgstr "" msgid "ThreatBook Public DNS (117.50.10.10)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:662 +#: htdocs/luci-static/resources/view/homeproxy/client.js:659 msgid "" "Timeout of rejected DNS response cache. 7d is used by default." msgstr "" @@ -2213,7 +2209,7 @@ msgid "" "code>." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:267 +#: htdocs/luci-static/resources/view/homeproxy/client.js:264 msgid "" "To enable Tun support, you need to install ip-full and " "kmod-tun" @@ -2234,18 +2230,18 @@ msgstr "" msgid "Tuic" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:265 +#: htdocs/luci-static/resources/view/homeproxy/client.js:262 msgid "Tun TCP/UDP" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1001 +#: htdocs/luci-static/resources/view/homeproxy/client.js:998 #: htdocs/luci-static/resources/view/homeproxy/node.js:393 #: htdocs/luci-static/resources/view/homeproxy/server.js:144 msgid "Type" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:489 -#: htdocs/luci-static/resources/view/homeproxy/client.js:817 +#: htdocs/luci-static/resources/view/homeproxy/client.js:486 +#: htdocs/luci-static/resources/view/homeproxy/client.js:814 #: htdocs/luci-static/resources/view/homeproxy/server.js:801 msgid "UDP" msgstr "" @@ -2255,7 +2251,7 @@ msgstr "" msgid "UDP Fragment" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:316 +#: htdocs/luci-static/resources/view/homeproxy/client.js:313 #: htdocs/luci-static/resources/view/homeproxy/server.js:782 msgid "UDP NAT expiration time" msgstr "" @@ -2281,11 +2277,11 @@ msgstr "" msgid "UUID" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:97 +#: htdocs/luci-static/resources/view/homeproxy/status.js:98 msgid "Unknown error." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:147 +#: htdocs/luci-static/resources/view/homeproxy/status.js:148 msgid "Unknown error: %s" msgstr "" @@ -2297,15 +2293,15 @@ msgstr "" msgid "Update %s subscriptions" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:88 +#: htdocs/luci-static/resources/view/homeproxy/status.js:89 msgid "Update failed." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1060 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1057 msgid "Update interval" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1061 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1058 msgid "Update interval of rule set.
1d will be used if empty." msgstr "" @@ -2361,8 +2357,8 @@ msgid "" "given." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:559 -#: htdocs/luci-static/resources/view/homeproxy/client.js:893 +#: htdocs/luci-static/resources/view/homeproxy/client.js:556 +#: htdocs/luci-static/resources/view/homeproxy/client.js:890 msgid "User" msgstr "" @@ -2386,7 +2382,7 @@ msgstr "" msgid "WAN DNS (read from interface)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1131 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1128 msgid "WAN IP Policy" msgstr "" @@ -2448,7 +2444,7 @@ msgstr "" msgid "default" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:52 +#: htdocs/luci-static/resources/view/homeproxy/status.js:53 msgid "failed" msgstr "" @@ -2466,14 +2462,14 @@ msgstr "" msgid "gRPC service name" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:292 +#: htdocs/luci-static/resources/view/homeproxy/client.js:289 msgid "gVisor" msgstr "" #: htdocs/luci-static/resources/homeproxy.js:263 #: htdocs/luci-static/resources/homeproxy.js:281 #: htdocs/luci-static/resources/view/homeproxy/client.js:176 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1024 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1021 #: htdocs/luci-static/resources/view/homeproxy/node.js:452 #: htdocs/luci-static/resources/view/homeproxy/node.js:1082 #: htdocs/luci-static/resources/view/homeproxy/server.js:211 @@ -2491,7 +2487,7 @@ msgstr "" msgid "packet addr (v2ray-core v5+)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:49 +#: htdocs/luci-static/resources/view/homeproxy/status.js:50 msgid "passed" msgstr "" @@ -2499,11 +2495,11 @@ msgstr "" msgid "private key" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:226 +#: htdocs/luci-static/resources/view/homeproxy/status.js:227 msgid "sing-box client" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:229 +#: htdocs/luci-static/resources/view/homeproxy/status.js:230 msgid "sing-box server" msgstr "" @@ -2517,7 +2513,7 @@ msgid "" "resistance." msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/status.js:58 +#: htdocs/luci-static/resources/view/homeproxy/status.js:59 msgid "unchecked" msgstr "" @@ -2550,8 +2546,8 @@ msgstr "" msgid "valid IP address" msgstr "" +#: htdocs/luci-static/resources/view/homeproxy/client.js:1026 #: htdocs/luci-static/resources/view/homeproxy/client.js:1029 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1032 #: htdocs/luci-static/resources/view/homeproxy/node.js:1311 #: htdocs/luci-static/resources/view/homeproxy/node.js:1314 msgid "valid URL" @@ -2565,8 +2561,8 @@ msgstr "" msgid "valid base64 key with %d characters" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1171 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1200 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1168 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1197 msgid "valid hostname" msgstr "" @@ -2574,8 +2570,7 @@ msgstr "" msgid "valid port range (port1:port2)" msgstr "" -#: htdocs/luci-static/resources/view/homeproxy/client.js:244 -#: htdocs/luci-static/resources/view/homeproxy/client.js:249 +#: htdocs/luci-static/resources/view/homeproxy/client.js:246 msgid "valid port value" msgstr "" diff --git a/luci-app-homeproxy/po/zh_Hans/homeproxy.po b/luci-app-homeproxy/po/zh_Hans/homeproxy.po index 351ca1a4dd..7b2c16609f 100644 --- a/luci-app-homeproxy/po/zh_Hans/homeproxy.po +++ b/luci-app-homeproxy/po/zh_Hans/homeproxy.po @@ -8,7 +8,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -#: htdocs/luci-static/resources/view/homeproxy/status.js:158 +#: htdocs/luci-static/resources/view/homeproxy/status.js:159 msgid "%s log" msgstr "%s 日志" @@ -16,12 +16,12 @@ msgstr "%s 日志" msgid "%s nodes removed" msgstr "移除了 %s 个节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:569 -#: htdocs/luci-static/resources/view/homeproxy/client.js:903 +#: htdocs/luci-static/resources/view/homeproxy/client.js:566 +#: htdocs/luci-static/resources/view/homeproxy/client.js:900 msgid "-- Please choose --" msgstr "-- 请选择 --" -#: htdocs/luci-static/resources/view/homeproxy/client.js:474 +#: htdocs/luci-static/resources/view/homeproxy/client.js:471 msgid "4 or 6. Not limited if empty." msgstr "4 或 6。留空不限制。" @@ -39,7 +39,7 @@ msgstr "API 令牌" msgid "Accept any if empty." msgstr "留空则不校验。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1066 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1063 msgid "Access Control" msgstr "访问控制" @@ -51,11 +51,11 @@ msgstr "访问密钥 ID" msgid "Access key secret" msgstr "访问密钥" -#: htdocs/luci-static/resources/view/homeproxy/client.js:772 +#: htdocs/luci-static/resources/view/homeproxy/client.js:769 msgid "Add a DNS rule" msgstr "新增 DNS 规则" -#: htdocs/luci-static/resources/view/homeproxy/client.js:677 +#: htdocs/luci-static/resources/view/homeproxy/client.js:674 msgid "Add a DNS server" msgstr "新增 DNS 服务器" @@ -63,15 +63,15 @@ msgstr "新增 DNS 服务器" msgid "Add a node" msgstr "新增节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:364 +#: htdocs/luci-static/resources/view/homeproxy/client.js:361 msgid "Add a routing node" msgstr "新增路由节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:440 +#: htdocs/luci-static/resources/view/homeproxy/client.js:437 msgid "Add a routing rule" msgstr "新增路由规则" -#: htdocs/luci-static/resources/view/homeproxy/client.js:987 +#: htdocs/luci-static/resources/view/homeproxy/client.js:984 msgid "Add a rule set" msgstr "新增规则集" @@ -79,16 +79,16 @@ msgstr "新增规则集" msgid "Add a server" msgstr "新增服务器" -#: htdocs/luci-static/resources/view/homeproxy/client.js:691 +#: htdocs/luci-static/resources/view/homeproxy/client.js:688 #: htdocs/luci-static/resources/view/homeproxy/node.js:413 msgid "Address" msgstr "地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:695 +#: htdocs/luci-static/resources/view/homeproxy/client.js:692 msgid "Address resolver" msgstr "地址解析器" -#: htdocs/luci-static/resources/view/homeproxy/client.js:727 +#: htdocs/luci-static/resources/view/homeproxy/client.js:724 msgid "Address strategy" msgstr "地址解析策略" @@ -123,11 +123,11 @@ msgstr "从订阅获取节点时，默认允许不安全连接。" msgid "Allowed payload size is in the request." msgstr "请求中允许的载荷大小。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:94 +#: htdocs/luci-static/resources/view/homeproxy/status.js:95 msgid "Already at the latest version." msgstr "已是最新版本。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:91 +#: htdocs/luci-static/resources/view/homeproxy/status.js:92 msgid "Already in updating." msgstr "已在更新中。" @@ -148,13 +148,13 @@ msgstr "替代 HTTPS 端口" msgid "An error occurred during updating subscriptions: %s" msgstr "更新订阅时发生错误：%s" -#: htdocs/luci-static/resources/view/homeproxy/client.js:929 +#: htdocs/luci-static/resources/view/homeproxy/client.js:926 msgid "Any" msgstr "任何" -#: htdocs/luci-static/resources/view/homeproxy/client.js:651 -#: htdocs/luci-static/resources/view/homeproxy/client.js:757 -#: htdocs/luci-static/resources/view/homeproxy/client.js:971 +#: htdocs/luci-static/resources/view/homeproxy/client.js:648 +#: htdocs/luci-static/resources/view/homeproxy/client.js:754 +#: htdocs/luci-static/resources/view/homeproxy/client.js:968 msgid "" "Append a edns0-subnet OPT extra record with the specified IP " "prefix to every query by default.
If value is an IP address instead of " @@ -214,7 +214,7 @@ msgstr "自动更新订阅。" msgid "BBR" msgstr "BBR" -#: htdocs/luci-static/resources/view/homeproxy/status.js:193 +#: htdocs/luci-static/resources/view/homeproxy/status.js:194 msgid "BaiDu" msgstr "百度" @@ -223,20 +223,20 @@ msgstr "百度" msgid "Base64" msgstr "Base64" -#: htdocs/luci-static/resources/view/homeproxy/client.js:304 +#: htdocs/luci-static/resources/view/homeproxy/client.js:301 msgid "Based on google/gvisor." msgstr "基于 google/gvisor。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1009 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1006 msgid "Binary file" msgstr "二进制文件" -#: htdocs/luci-static/resources/view/homeproxy/client.js:391 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1079 +#: htdocs/luci-static/resources/view/homeproxy/client.js:388 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1076 msgid "Bind interface" msgstr "绑定接口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1080 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1077 msgid "" "Bind outbound traffic to specific interface. Leave empty to auto detect." msgstr "绑定出站流量至指定端口。留空自动检测。" @@ -245,26 +245,26 @@ msgstr "绑定出站流量至指定端口。留空自动检测。" msgid "Blacklist mode" msgstr "黑名单模式" -#: htdocs/luci-static/resources/view/homeproxy/client.js:342 -#: htdocs/luci-static/resources/view/homeproxy/client.js:597 -#: htdocs/luci-static/resources/view/homeproxy/client.js:931 +#: htdocs/luci-static/resources/view/homeproxy/client.js:339 +#: htdocs/luci-static/resources/view/homeproxy/client.js:594 +#: htdocs/luci-static/resources/view/homeproxy/client.js:928 msgid "Block" msgstr "封锁" -#: htdocs/luci-static/resources/view/homeproxy/client.js:627 -#: htdocs/luci-static/resources/view/homeproxy/client.js:949 +#: htdocs/luci-static/resources/view/homeproxy/client.js:624 +#: htdocs/luci-static/resources/view/homeproxy/client.js:946 msgid "Block DNS queries" msgstr "封锁 DNS 请求" -#: htdocs/luci-static/resources/view/homeproxy/client.js:477 -#: htdocs/luci-static/resources/view/homeproxy/client.js:490 -#: htdocs/luci-static/resources/view/homeproxy/client.js:808 -#: htdocs/luci-static/resources/view/homeproxy/client.js:818 +#: htdocs/luci-static/resources/view/homeproxy/client.js:474 +#: htdocs/luci-static/resources/view/homeproxy/client.js:487 +#: htdocs/luci-static/resources/view/homeproxy/client.js:805 +#: htdocs/luci-static/resources/view/homeproxy/client.js:815 #: htdocs/luci-static/resources/view/homeproxy/server.js:802 msgid "Both" msgstr "全部" -#: htdocs/luci-static/resources/view/homeproxy/client.js:325 +#: htdocs/luci-static/resources/view/homeproxy/client.js:322 msgid "Bypass CN traffic" msgstr "绕过中国流量" @@ -272,7 +272,7 @@ msgstr "绕过中国流量" msgid "Bypass mainland China" msgstr "大陆白名单" -#: htdocs/luci-static/resources/view/homeproxy/client.js:326 +#: htdocs/luci-static/resources/view/homeproxy/client.js:323 msgid "Bypass mainland China traffic via firewall rules by default." msgstr "默认使用防火墙规则绕过中国大陆流量。" @@ -297,11 +297,11 @@ msgstr "取消" msgid "Certificate path" msgstr "证书路径" -#: htdocs/luci-static/resources/view/homeproxy/status.js:56 +#: htdocs/luci-static/resources/view/homeproxy/status.js:57 msgid "Check" msgstr "检查" -#: htdocs/luci-static/resources/view/homeproxy/status.js:104 +#: htdocs/luci-static/resources/view/homeproxy/status.js:105 msgid "Check update" msgstr "检查更新" @@ -309,15 +309,15 @@ msgstr "检查更新" msgid "China DNS server" msgstr "国内 DNS 服务器" -#: htdocs/luci-static/resources/view/homeproxy/status.js:203 +#: htdocs/luci-static/resources/view/homeproxy/status.js:204 msgid "China IPv4 list version" msgstr "大陆 IPv4 库版本" -#: htdocs/luci-static/resources/view/homeproxy/status.js:207 +#: htdocs/luci-static/resources/view/homeproxy/status.js:208 msgid "China IPv6 list version" msgstr "大陆 IPv6 库版本" -#: htdocs/luci-static/resources/view/homeproxy/status.js:211 +#: htdocs/luci-static/resources/view/homeproxy/status.js:212 msgid "China list version" msgstr "大陆域名列表版本" @@ -330,7 +330,7 @@ msgstr "密码套件" msgid "Cisco Public DNS (208.67.222.222)" msgstr "思科公共 DNS（208.67.222.222）" -#: htdocs/luci-static/resources/view/homeproxy/status.js:165 +#: htdocs/luci-static/resources/view/homeproxy/status.js:166 msgid "Clean log" msgstr "清空日志" @@ -350,9 +350,9 @@ msgstr "CloudFlare 公共 DNS（1.1.1.1）" msgid "Cloudflare" msgstr "Cloudflare" -#: htdocs/luci-static/resources/view/homeproxy/client.js:122 +#: htdocs/luci-static/resources/view/homeproxy/client.js:133 #: htdocs/luci-static/resources/view/homeproxy/server.js:110 -#: htdocs/luci-static/resources/view/homeproxy/status.js:128 +#: htdocs/luci-static/resources/view/homeproxy/status.js:129 msgid "Collecting data..." msgstr "收集数据中..." @@ -365,7 +365,7 @@ msgstr "仅常用端口（绕过 P2P 流量）" msgid "Congestion control algorithm" msgstr "拥塞控制算法" -#: htdocs/luci-static/resources/view/homeproxy/status.js:190 +#: htdocs/luci-static/resources/view/homeproxy/status.js:191 msgid "Connection check" msgstr "连接检查" @@ -373,19 +373,19 @@ msgstr "连接检查" msgid "Custom routing" msgstr "自定义路由" -#: htdocs/luci-static/resources/view/homeproxy/client.js:825 +#: htdocs/luci-static/resources/view/homeproxy/client.js:822 msgid "DNS" msgstr "DNS" -#: htdocs/luci-static/resources/view/homeproxy/client.js:763 +#: htdocs/luci-static/resources/view/homeproxy/client.js:760 msgid "DNS Rules" msgstr "DNS 规则" -#: htdocs/luci-static/resources/view/homeproxy/client.js:668 +#: htdocs/luci-static/resources/view/homeproxy/client.js:665 msgid "DNS Servers" msgstr "DNS 服务器" -#: htdocs/luci-static/resources/view/homeproxy/client.js:610 +#: htdocs/luci-static/resources/view/homeproxy/client.js:607 msgid "DNS Settings" msgstr "DNS 设置" @@ -393,12 +393,12 @@ msgstr "DNS 设置" msgid "DNS provider" msgstr "DNS 提供商" -#: htdocs/luci-static/resources/view/homeproxy/client.js:772 +#: htdocs/luci-static/resources/view/homeproxy/client.js:769 msgid "DNS rule" msgstr "DNS 规则" #: htdocs/luci-static/resources/view/homeproxy/client.js:158 -#: htdocs/luci-static/resources/view/homeproxy/client.js:677 +#: htdocs/luci-static/resources/view/homeproxy/client.js:674 msgid "DNS server" msgstr "DNS 服务器" @@ -407,31 +407,31 @@ msgid "DNS01 challenge" msgstr "DNS01 验证" #: htdocs/luci-static/resources/homeproxy.js:17 -#: htdocs/luci-static/resources/view/homeproxy/client.js:468 -#: htdocs/luci-static/resources/view/homeproxy/client.js:800 +#: htdocs/luci-static/resources/view/homeproxy/client.js:465 +#: htdocs/luci-static/resources/view/homeproxy/client.js:797 #: htdocs/luci-static/resources/view/homeproxy/node.js:645 msgid "Default" msgstr "默认" -#: htdocs/luci-static/resources/view/homeproxy/client.js:625 -#: htdocs/luci-static/resources/view/homeproxy/client.js:702 -#: htdocs/luci-static/resources/view/homeproxy/client.js:947 +#: htdocs/luci-static/resources/view/homeproxy/client.js:622 +#: htdocs/luci-static/resources/view/homeproxy/client.js:699 +#: htdocs/luci-static/resources/view/homeproxy/client.js:944 msgid "Default DNS (issued by WAN)" msgstr "默认 DNS（由 WAN 下发）" -#: htdocs/luci-static/resources/view/homeproxy/client.js:620 +#: htdocs/luci-static/resources/view/homeproxy/client.js:617 msgid "Default DNS server" msgstr "默认 DNS 服务器" -#: htdocs/luci-static/resources/view/homeproxy/client.js:615 +#: htdocs/luci-static/resources/view/homeproxy/client.js:612 msgid "Default DNS strategy" msgstr "默认 DNS 解析策略" -#: htdocs/luci-static/resources/view/homeproxy/client.js:734 +#: htdocs/luci-static/resources/view/homeproxy/client.js:731 msgid "Default domain strategy for resolving the domain names." msgstr "默认域名解析策略。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:335 +#: htdocs/luci-static/resources/view/homeproxy/client.js:332 msgid "Default outbound" msgstr "默认出站" @@ -443,38 +443,38 @@ msgstr "默认包封装格式" msgid "Default server name" msgstr "默认服务器名称" -#: htdocs/luci-static/resources/view/homeproxy/client.js:341 -#: htdocs/luci-static/resources/view/homeproxy/client.js:404 -#: htdocs/luci-static/resources/view/homeproxy/client.js:596 -#: htdocs/luci-static/resources/view/homeproxy/client.js:744 -#: htdocs/luci-static/resources/view/homeproxy/client.js:930 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1048 +#: htdocs/luci-static/resources/view/homeproxy/client.js:338 +#: htdocs/luci-static/resources/view/homeproxy/client.js:401 +#: htdocs/luci-static/resources/view/homeproxy/client.js:593 +#: htdocs/luci-static/resources/view/homeproxy/client.js:741 +#: htdocs/luci-static/resources/view/homeproxy/client.js:927 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1045 #: htdocs/luci-static/resources/view/homeproxy/node.js:394 msgid "Direct" msgstr "直连" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1178 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1175 msgid "Direct Domain List" msgstr "直连域名列表" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1095 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1140 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1092 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1137 msgid "Direct IPv4 IP-s" msgstr "直连 IPv4 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1098 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1143 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1095 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1140 msgid "Direct IPv6 IP-s" msgstr "直连 IPv6 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1101 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1098 msgid "Direct MAC-s" msgstr "直连 MAC 地址" #: htdocs/luci-static/resources/view/homeproxy/client.js:142 #: htdocs/luci-static/resources/view/homeproxy/client.js:150 -#: htdocs/luci-static/resources/view/homeproxy/client.js:340 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1089 +#: htdocs/luci-static/resources/view/homeproxy/client.js:337 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1086 #: htdocs/luci-static/resources/view/homeproxy/node.js:473 #: htdocs/luci-static/resources/view/homeproxy/node.js:492 #: htdocs/luci-static/resources/view/homeproxy/node.js:504 @@ -485,7 +485,7 @@ msgstr "直连 MAC 地址" msgid "Disable" msgstr "禁用" -#: htdocs/luci-static/resources/view/homeproxy/client.js:638 +#: htdocs/luci-static/resources/view/homeproxy/client.js:635 msgid "Disable DNS cache" msgstr "禁用 DNS 缓存" @@ -502,15 +502,15 @@ msgstr "禁用路径 MTU 探测" msgid "Disable TLS ALPN challenge" msgstr "禁用 TLS ALPN 认证" -#: htdocs/luci-static/resources/view/homeproxy/client.js:961 +#: htdocs/luci-static/resources/view/homeproxy/client.js:958 msgid "Disable cache and save cache in this query." msgstr "在本次查询中禁用缓存。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:641 +#: htdocs/luci-static/resources/view/homeproxy/client.js:638 msgid "Disable cache expire" msgstr "缓存永不过期" -#: htdocs/luci-static/resources/view/homeproxy/client.js:960 +#: htdocs/luci-static/resources/view/homeproxy/client.js:957 msgid "Disable dns cache" msgstr "禁用 DNS 缓存" @@ -527,28 +527,28 @@ msgstr "" "禁用路径 MTU 发现 (RFC 8899)。 数据包的大小最多为 1252 (IPv4) / 1232 (IPv6) " "字节。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:501 -#: htdocs/luci-static/resources/view/homeproxy/client.js:837 +#: htdocs/luci-static/resources/view/homeproxy/client.js:498 +#: htdocs/luci-static/resources/view/homeproxy/client.js:834 msgid "Domain keyword" msgstr "域名关键词" -#: htdocs/luci-static/resources/view/homeproxy/client.js:492 -#: htdocs/luci-static/resources/view/homeproxy/client.js:828 +#: htdocs/luci-static/resources/view/homeproxy/client.js:489 +#: htdocs/luci-static/resources/view/homeproxy/client.js:825 msgid "Domain name" msgstr "域名" -#: htdocs/luci-static/resources/view/homeproxy/client.js:505 -#: htdocs/luci-static/resources/view/homeproxy/client.js:841 +#: htdocs/luci-static/resources/view/homeproxy/client.js:502 +#: htdocs/luci-static/resources/view/homeproxy/client.js:838 msgid "Domain regex" msgstr "域名正则表达式" -#: htdocs/luci-static/resources/view/homeproxy/client.js:385 +#: htdocs/luci-static/resources/view/homeproxy/client.js:382 #: htdocs/luci-static/resources/view/homeproxy/server.js:793 msgid "Domain strategy" msgstr "域名解析策略" -#: htdocs/luci-static/resources/view/homeproxy/client.js:497 -#: htdocs/luci-static/resources/view/homeproxy/client.js:833 +#: htdocs/luci-static/resources/view/homeproxy/client.js:494 +#: htdocs/luci-static/resources/view/homeproxy/client.js:830 msgid "Domain suffix" msgstr "域名后缀" @@ -603,9 +603,9 @@ msgstr "" msgid "ECH config" msgstr "ECH 配置" -#: htdocs/luci-static/resources/view/homeproxy/client.js:650 -#: htdocs/luci-static/resources/view/homeproxy/client.js:756 -#: htdocs/luci-static/resources/view/homeproxy/client.js:970 +#: htdocs/luci-static/resources/view/homeproxy/client.js:647 +#: htdocs/luci-static/resources/view/homeproxy/client.js:753 +#: htdocs/luci-static/resources/view/homeproxy/client.js:967 msgid "EDNS Client subnet" msgstr "ENDS 客户端子网" @@ -631,11 +631,11 @@ msgstr "修改节点" msgid "Email" msgstr "Email" -#: htdocs/luci-static/resources/view/homeproxy/client.js:373 -#: htdocs/luci-static/resources/view/homeproxy/client.js:455 -#: htdocs/luci-static/resources/view/homeproxy/client.js:686 -#: htdocs/luci-static/resources/view/homeproxy/client.js:787 -#: htdocs/luci-static/resources/view/homeproxy/client.js:996 +#: htdocs/luci-static/resources/view/homeproxy/client.js:370 +#: htdocs/luci-static/resources/view/homeproxy/client.js:452 +#: htdocs/luci-static/resources/view/homeproxy/client.js:683 +#: htdocs/luci-static/resources/view/homeproxy/client.js:784 +#: htdocs/luci-static/resources/view/homeproxy/client.js:993 #: htdocs/luci-static/resources/view/homeproxy/server.js:116 #: htdocs/luci-static/resources/view/homeproxy/server.js:139 msgid "Enable" @@ -683,7 +683,7 @@ msgstr "启用 TCP Brutal 拥塞控制算法。" msgid "Enable UDP fragmentation." msgstr "启用 UDP 分片。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:309 +#: htdocs/luci-static/resources/view/homeproxy/client.js:306 msgid "Enable endpoint-independent NAT" msgstr "启用端点独立 NAT" @@ -717,13 +717,12 @@ msgstr "加密方式" #: htdocs/luci-static/resources/view/homeproxy/client.js:176 #: htdocs/luci-static/resources/view/homeproxy/client.js:178 #: htdocs/luci-static/resources/view/homeproxy/client.js:206 -#: htdocs/luci-static/resources/view/homeproxy/client.js:244 -#: htdocs/luci-static/resources/view/homeproxy/client.js:249 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1024 +#: htdocs/luci-static/resources/view/homeproxy/client.js:246 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1021 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1026 #: htdocs/luci-static/resources/view/homeproxy/client.js:1029 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1032 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1171 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1200 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1168 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1197 #: htdocs/luci-static/resources/view/homeproxy/node.js:452 #: htdocs/luci-static/resources/view/homeproxy/node.js:1082 #: htdocs/luci-static/resources/view/homeproxy/node.js:1255 @@ -764,7 +763,7 @@ msgstr "过滤节点" msgid "Flow" msgstr "流控" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1007 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1004 msgid "Format" msgstr "格式" @@ -772,7 +771,7 @@ msgstr "格式" msgid "GET" msgstr "GET" -#: htdocs/luci-static/resources/view/homeproxy/status.js:215 +#: htdocs/luci-static/resources/view/homeproxy/status.js:216 msgid "GFW list version" msgstr "GFW 域名列表版本" @@ -780,15 +779,15 @@ msgstr "GFW 域名列表版本" msgid "GFWList" msgstr "GFWList" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1113 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1110 msgid "Gaming mode IPv4 IP-s" msgstr "游戏模式 IPv4 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1115 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1112 msgid "Gaming mode IPv6 IP-s" msgstr "游戏模式 IPv6 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1118 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1115 msgid "Gaming mode MAC-s" msgstr "游戏模式 MAC 地址" @@ -799,7 +798,7 @@ msgstr "游戏模式 MAC 地址" msgid "Generate" msgstr "生成" -#: htdocs/luci-static/resources/view/homeproxy/client.js:282 +#: htdocs/luci-static/resources/view/homeproxy/client.js:279 #: htdocs/luci-static/resources/view/homeproxy/node.js:835 msgid "Generic segmentation offload" msgstr "通用分段卸载（GSO）" @@ -812,15 +811,15 @@ msgstr "全局" msgid "Global padding" msgstr "全局填充" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1120 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1117 msgid "Global proxy IPv4 IP-s" msgstr "全局代理 IPv4 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1123 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1120 msgid "Global proxy IPv6 IP-s" msgstr "全局代理 IPv6 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1126 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1123 msgid "Global proxy MAC-s" msgstr "全局代理 MAC 地址" @@ -828,7 +827,7 @@ msgstr "全局代理 MAC 地址" msgid "Global settings" msgstr "全局设置" -#: htdocs/luci-static/resources/view/homeproxy/status.js:196 +#: htdocs/luci-static/resources/view/homeproxy/status.js:197 msgid "Google" msgstr "谷歌" @@ -840,8 +839,8 @@ msgstr "谷歌公共 DNS（8.8.8.8）" msgid "Grant access to homeproxy configuration" msgstr "授予 homeproxy 访问 UCI 配置的权限" -#: htdocs/luci-static/resources/view/homeproxy/client.js:482 -#: htdocs/luci-static/resources/view/homeproxy/client.js:822 +#: htdocs/luci-static/resources/view/homeproxy/client.js:479 +#: htdocs/luci-static/resources/view/homeproxy/client.js:819 #: htdocs/luci-static/resources/view/homeproxy/node.js:395 #: htdocs/luci-static/resources/view/homeproxy/node.js:715 #: htdocs/luci-static/resources/view/homeproxy/server.js:145 @@ -875,8 +874,8 @@ msgstr "心跳间隔" #: htdocs/luci-static/resources/view/homeproxy/client.js:55 #: htdocs/luci-static/resources/view/homeproxy/client.js:57 -#: htdocs/luci-static/resources/view/homeproxy/client.js:109 -#: htdocs/luci-static/resources/view/homeproxy/status.js:223 +#: htdocs/luci-static/resources/view/homeproxy/client.js:120 +#: htdocs/luci-static/resources/view/homeproxy/status.js:224 #: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3 msgid "HomeProxy" msgstr "HomeProxy" @@ -896,8 +895,8 @@ msgstr "HomeProxy 服务端" msgid "Host" msgstr "主机名" -#: htdocs/luci-static/resources/view/homeproxy/client.js:445 -#: htdocs/luci-static/resources/view/homeproxy/client.js:777 +#: htdocs/luci-static/resources/view/homeproxy/client.js:442 +#: htdocs/luci-static/resources/view/homeproxy/client.js:774 msgid "Host fields" msgstr "主机字段" @@ -925,18 +924,18 @@ msgstr "Hysteria" msgid "Hysteria2" msgstr "Hysteria2" -#: htdocs/luci-static/resources/view/homeproxy/client.js:520 -#: htdocs/luci-static/resources/view/homeproxy/client.js:865 +#: htdocs/luci-static/resources/view/homeproxy/client.js:517 +#: htdocs/luci-static/resources/view/homeproxy/client.js:862 msgid "IP CIDR" msgstr "IP CIDR" -#: htdocs/luci-static/resources/view/homeproxy/client.js:473 -#: htdocs/luci-static/resources/view/homeproxy/client.js:805 +#: htdocs/luci-static/resources/view/homeproxy/client.js:470 +#: htdocs/luci-static/resources/view/homeproxy/client.js:802 msgid "IP version" msgstr "IP 版本" -#: htdocs/luci-static/resources/view/homeproxy/client.js:475 -#: htdocs/luci-static/resources/view/homeproxy/client.js:806 +#: htdocs/luci-static/resources/view/homeproxy/client.js:472 +#: htdocs/luci-static/resources/view/homeproxy/client.js:803 msgid "IPv4" msgstr "IPv4" @@ -944,8 +943,8 @@ msgstr "IPv4" msgid "IPv4 only" msgstr "仅 IPv4" -#: htdocs/luci-static/resources/view/homeproxy/client.js:476 -#: htdocs/luci-static/resources/view/homeproxy/client.js:807 +#: htdocs/luci-static/resources/view/homeproxy/client.js:473 +#: htdocs/luci-static/resources/view/homeproxy/client.js:804 msgid "IPv6" msgstr "IPv6" @@ -953,7 +952,7 @@ msgstr "IPv6" msgid "IPv6 only" msgstr "仅 IPv6" -#: htdocs/luci-static/resources/view/homeproxy/client.js:272 +#: htdocs/luci-static/resources/view/homeproxy/client.js:269 msgid "IPv6 support" msgstr "IPv6 支持" @@ -973,12 +972,10 @@ msgid "" "If set, the requested domain name will be resolved to IP before routing." msgstr "如果设置，请求的域名将在路由前被解析为 IP 地址。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:386 +#: htdocs/luci-static/resources/view/homeproxy/client.js:383 msgid "" -"If set, the server domain name will be resolved to IP before connecting.
dns.strategy will be used if empty." -msgstr "" -"如果设置，服务器域名将在连接前被解析为 IP。
默认使用 dns.strategy。" +"If set, the server domain name will be resolved to IP before connecting.
" +msgstr "如果设置，服务器域名将在连接前被解析为 IP。" #: htdocs/luci-static/resources/view/homeproxy/node.js:742 #: htdocs/luci-static/resources/view/homeproxy/server.js:406 @@ -1009,16 +1006,16 @@ msgstr "导入" msgid "Import share links" msgstr "导入分享链接" -#: htdocs/luci-static/resources/view/homeproxy/client.js:317 +#: htdocs/luci-static/resources/view/homeproxy/client.js:314 #: htdocs/luci-static/resources/view/homeproxy/server.js:783 msgid "In seconds. 300 is used by default." msgstr "单位：秒。默认使用 300。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:645 +#: htdocs/luci-static/resources/view/homeproxy/client.js:642 msgid "Independent cache per server" msgstr "独立缓存" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1072 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1069 msgid "Interface Control" msgstr "接口控制" @@ -1029,13 +1026,13 @@ msgid "" "seconds)." msgstr "发送心跳包以保持连接存活的时间间隔（单位：秒）。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:585 -#: htdocs/luci-static/resources/view/homeproxy/client.js:918 +#: htdocs/luci-static/resources/view/homeproxy/client.js:582 +#: htdocs/luci-static/resources/view/homeproxy/client.js:915 msgid "Invert" msgstr "反转" -#: htdocs/luci-static/resources/view/homeproxy/client.js:586 -#: htdocs/luci-static/resources/view/homeproxy/client.js:919 +#: htdocs/luci-static/resources/view/homeproxy/client.js:583 +#: htdocs/luci-static/resources/view/homeproxy/client.js:916 msgid "Invert match result." msgstr "反转匹配结果" @@ -1047,15 +1044,15 @@ msgstr "它必须支持 TCP 查询。" msgid "Key path" msgstr "证书路径" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1086 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1083 msgid "LAN IP Policy" msgstr "LAN IP 策略" -#: htdocs/luci-static/resources/view/homeproxy/client.js:368 -#: htdocs/luci-static/resources/view/homeproxy/client.js:450 -#: htdocs/luci-static/resources/view/homeproxy/client.js:681 -#: htdocs/luci-static/resources/view/homeproxy/client.js:782 -#: htdocs/luci-static/resources/view/homeproxy/client.js:991 +#: htdocs/luci-static/resources/view/homeproxy/client.js:365 +#: htdocs/luci-static/resources/view/homeproxy/client.js:447 +#: htdocs/luci-static/resources/view/homeproxy/client.js:678 +#: htdocs/luci-static/resources/view/homeproxy/client.js:779 +#: htdocs/luci-static/resources/view/homeproxy/client.js:988 #: htdocs/luci-static/resources/view/homeproxy/node.js:388 #: htdocs/luci-static/resources/view/homeproxy/server.js:133 msgid "Label" @@ -1070,7 +1067,7 @@ msgstr "" "提供旧协议支持（VMess MD5 身份验证）仅出于兼容性目的，不建议使用 alterId > " "1。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:306 +#: htdocs/luci-static/resources/view/homeproxy/client.js:303 msgid "Less compatibility and sometimes better performance." msgstr "有时性能更好。" @@ -1092,7 +1089,7 @@ msgstr "支持的应用层协议协商列表，按顺序排列。" msgid "Listen address" msgstr "监听地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1074 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1071 msgid "Listen interfaces" msgstr "监听接口" @@ -1100,11 +1097,11 @@ msgstr "监听接口" msgid "Listen port" msgstr "监听端口" -#: htdocs/luci-static/resources/view/homeproxy/status.js:126 +#: htdocs/luci-static/resources/view/homeproxy/status.js:127 msgid "Loading" msgstr "加载中" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1002 +#: htdocs/luci-static/resources/view/homeproxy/client.js:999 msgid "Local" msgstr "本地" @@ -1112,11 +1109,11 @@ msgstr "本地" msgid "Local address" msgstr "本地地址" -#: htdocs/luci-static/resources/view/homeproxy/status.js:143 +#: htdocs/luci-static/resources/view/homeproxy/status.js:144 msgid "Log file does not exist." msgstr "日志文件不存在。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:136 +#: htdocs/luci-static/resources/view/homeproxy/status.js:137 msgid "Log is empty." msgstr "日志为空。" @@ -1132,15 +1129,15 @@ msgstr "主 UDP 节点" msgid "Main node" msgstr "主节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:914 +#: htdocs/luci-static/resources/view/homeproxy/client.js:911 msgid "Make ipcidr in rule sets match the source IP." msgstr "使规则集中的 ipcidr 用于匹配源 IP。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:580 +#: htdocs/luci-static/resources/view/homeproxy/client.js:577 msgid "Make IP CIDR in rule set used to match the source IP." msgstr "使规则集中的 IP CIDR 用于匹配源 IP。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:646 +#: htdocs/luci-static/resources/view/homeproxy/client.js:643 msgid "" "Make each DNS server's cache independent for special purposes. If enabled, " "will slightly degrade performance." @@ -1150,101 +1147,101 @@ msgstr "独立缓存每个 DNS 服务器的结果以供特殊用途。启用后 msgid "Masquerade" msgstr "伪装" -#: htdocs/luci-static/resources/view/homeproxy/client.js:924 +#: htdocs/luci-static/resources/view/homeproxy/client.js:921 msgid "Match .outbounds[].server domains." msgstr "匹配 .outbounds[].server 域名。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:866 +#: htdocs/luci-static/resources/view/homeproxy/client.js:863 msgid "Match IP CIDR with query response." msgstr "使用查询响应匹配 IP CIDR。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:521 +#: htdocs/luci-static/resources/view/homeproxy/client.js:518 msgid "Match IP CIDR." msgstr "匹配 IP CIDR。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:498 -#: htdocs/luci-static/resources/view/homeproxy/client.js:834 +#: htdocs/luci-static/resources/view/homeproxy/client.js:495 +#: htdocs/luci-static/resources/view/homeproxy/client.js:831 msgid "Match domain suffix." msgstr "匹配域名后缀。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:502 -#: htdocs/luci-static/resources/view/homeproxy/client.js:838 +#: htdocs/luci-static/resources/view/homeproxy/client.js:499 +#: htdocs/luci-static/resources/view/homeproxy/client.js:835 msgid "Match domain using keyword." msgstr "使用关键词匹配域名。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:506 -#: htdocs/luci-static/resources/view/homeproxy/client.js:842 +#: htdocs/luci-static/resources/view/homeproxy/client.js:503 +#: htdocs/luci-static/resources/view/homeproxy/client.js:839 msgid "Match domain using regular expression." msgstr "使用正则表达式匹配域名。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:493 -#: htdocs/luci-static/resources/view/homeproxy/client.js:829 +#: htdocs/luci-static/resources/view/homeproxy/client.js:490 +#: htdocs/luci-static/resources/view/homeproxy/client.js:826 msgid "Match full domain." msgstr "匹配完整域名。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:547 -#: htdocs/luci-static/resources/view/homeproxy/client.js:851 +#: htdocs/luci-static/resources/view/homeproxy/client.js:544 +#: htdocs/luci-static/resources/view/homeproxy/client.js:848 msgid "Match port range. Format as START:/:END/START:END." msgstr "匹配端口范围。格式为 START:/:END/START:END。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:542 -#: htdocs/luci-static/resources/view/homeproxy/client.js:846 +#: htdocs/luci-static/resources/view/homeproxy/client.js:539 +#: htdocs/luci-static/resources/view/homeproxy/client.js:843 msgid "Match port." msgstr "匹配端口。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:871 +#: htdocs/luci-static/resources/view/homeproxy/client.js:868 msgid "Match private IP with query response." msgstr "使用查询响应匹配私有 IP。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:526 +#: htdocs/luci-static/resources/view/homeproxy/client.js:523 msgid "Match private IP." msgstr "匹配私有 IP。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:515 -#: htdocs/luci-static/resources/view/homeproxy/client.js:861 +#: htdocs/luci-static/resources/view/homeproxy/client.js:512 +#: htdocs/luci-static/resources/view/homeproxy/client.js:858 msgid "Match private source IP." msgstr "匹配私有源 IP。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:552 -#: htdocs/luci-static/resources/view/homeproxy/client.js:886 +#: htdocs/luci-static/resources/view/homeproxy/client.js:549 +#: htdocs/luci-static/resources/view/homeproxy/client.js:883 msgid "Match process name." msgstr "匹配进程名。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:556 -#: htdocs/luci-static/resources/view/homeproxy/client.js:890 +#: htdocs/luci-static/resources/view/homeproxy/client.js:553 +#: htdocs/luci-static/resources/view/homeproxy/client.js:887 msgid "Match process path." msgstr "匹配进程路径。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:812 +#: htdocs/luci-static/resources/view/homeproxy/client.js:809 msgid "Match query type." msgstr "匹配请求类型。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:564 -#: htdocs/luci-static/resources/view/homeproxy/client.js:898 +#: htdocs/luci-static/resources/view/homeproxy/client.js:561 +#: htdocs/luci-static/resources/view/homeproxy/client.js:895 msgid "Match rule set." msgstr "匹配规则集。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:510 -#: htdocs/luci-static/resources/view/homeproxy/client.js:856 +#: htdocs/luci-static/resources/view/homeproxy/client.js:507 +#: htdocs/luci-static/resources/view/homeproxy/client.js:853 msgid "Match source IP CIDR." msgstr "匹配源 IP CIDR。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:579 +#: htdocs/luci-static/resources/view/homeproxy/client.js:576 msgid "Match source IP via rule set" msgstr "通过规则集匹配源 IP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:537 -#: htdocs/luci-static/resources/view/homeproxy/client.js:881 +#: htdocs/luci-static/resources/view/homeproxy/client.js:534 +#: htdocs/luci-static/resources/view/homeproxy/client.js:878 msgid "Match source port range. Format as START:/:END/START:END." msgstr "匹配源端口范围。格式为 START:/:END/START:END。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:532 -#: htdocs/luci-static/resources/view/homeproxy/client.js:876 +#: htdocs/luci-static/resources/view/homeproxy/client.js:529 +#: htdocs/luci-static/resources/view/homeproxy/client.js:873 msgid "Match source port." msgstr "匹配源端口。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:560 -#: htdocs/luci-static/resources/view/homeproxy/client.js:894 +#: htdocs/luci-static/resources/view/homeproxy/client.js:557 +#: htdocs/luci-static/resources/view/homeproxy/client.js:891 msgid "Match user name." msgstr "匹配用户名。" @@ -1313,16 +1310,16 @@ msgstr "在打开新连接之前，连接中的最小多路复用流数量。" msgid "Minimum streams" msgstr "最小流数量" -#: htdocs/luci-static/resources/view/homeproxy/client.js:291 +#: htdocs/luci-static/resources/view/homeproxy/client.js:288 msgid "Mixed" msgstr "混合" -#: htdocs/luci-static/resources/view/homeproxy/client.js:302 +#: htdocs/luci-static/resources/view/homeproxy/client.js:299 msgid "Mixed system TCP stack and gVisor UDP stack." msgstr "混合系统 TCP 栈和 gVisor UDP 栈。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:460 -#: htdocs/luci-static/resources/view/homeproxy/client.js:792 +#: htdocs/luci-static/resources/view/homeproxy/client.js:457 +#: htdocs/luci-static/resources/view/homeproxy/client.js:789 msgid "Mode" msgstr "模式" @@ -1357,8 +1354,8 @@ msgstr "原生" msgid "NaïveProxy" msgstr "NaïveProxy" -#: htdocs/luci-static/resources/view/homeproxy/client.js:487 -#: htdocs/luci-static/resources/view/homeproxy/client.js:815 +#: htdocs/luci-static/resources/view/homeproxy/client.js:484 +#: htdocs/luci-static/resources/view/homeproxy/client.js:812 #: htdocs/luci-static/resources/view/homeproxy/server.js:799 msgid "Network" msgstr "网络" @@ -1391,7 +1388,7 @@ msgstr "无订阅节点" msgid "No valid share link found." msgstr "找不到有效分享链接。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:378 +#: htdocs/luci-static/resources/view/homeproxy/client.js:375 #: htdocs/luci-static/resources/view/homeproxy/node.js:363 msgid "Node" msgstr "节点" @@ -1404,7 +1401,7 @@ msgstr "节点设置" msgid "Nodes" msgstr "节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:701 +#: htdocs/luci-static/resources/view/homeproxy/client.js:698 #: htdocs/luci-static/resources/view/homeproxy/node.js:674 #: htdocs/luci-static/resources/view/homeproxy/node.js:713 #: htdocs/luci-static/resources/view/homeproxy/server.js:367 @@ -1422,7 +1419,7 @@ msgstr "混淆密码" msgid "Obfuscate type" msgstr "混淆类型" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1075 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1072 msgid "Only process traffic from specific interfaces. Leave empty for all." msgstr "只处理来自指定接口的流量。留空表示全部。" @@ -1430,20 +1427,20 @@ msgstr "只处理来自指定接口的流量。留空表示全部。" msgid "Only proxy mainland China" msgstr "仅代理中国大陆" -#: htdocs/luci-static/resources/view/homeproxy/client.js:444 -#: htdocs/luci-static/resources/view/homeproxy/client.js:776 +#: htdocs/luci-static/resources/view/homeproxy/client.js:441 +#: htdocs/luci-static/resources/view/homeproxy/client.js:773 msgid "Other fields" msgstr "其他字段" -#: htdocs/luci-static/resources/view/homeproxy/client.js:398 -#: htdocs/luci-static/resources/view/homeproxy/client.js:590 -#: htdocs/luci-static/resources/view/homeproxy/client.js:738 -#: htdocs/luci-static/resources/view/homeproxy/client.js:923 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1042 +#: htdocs/luci-static/resources/view/homeproxy/client.js:395 +#: htdocs/luci-static/resources/view/homeproxy/client.js:587 +#: htdocs/luci-static/resources/view/homeproxy/client.js:735 +#: htdocs/luci-static/resources/view/homeproxy/client.js:920 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1039 msgid "Outbound" msgstr "出站" -#: htdocs/luci-static/resources/view/homeproxy/client.js:379 +#: htdocs/luci-static/resources/view/homeproxy/client.js:376 msgid "Outbound node" msgstr "出站节点" @@ -1451,7 +1448,7 @@ msgstr "出站节点" msgid "Override address" msgstr "覆盖地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:330 +#: htdocs/luci-static/resources/view/homeproxy/client.js:327 #: htdocs/luci-static/resources/view/homeproxy/server.js:789 msgid "Override destination" msgstr "覆盖目标地址" @@ -1460,7 +1457,7 @@ msgstr "覆盖目标地址" msgid "Override port" msgstr "覆盖端口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:331 +#: htdocs/luci-static/resources/view/homeproxy/client.js:328 #: htdocs/luci-static/resources/view/homeproxy/server.js:790 msgid "Override the connection destination address with the sniffed domain." msgstr "使用嗅探到的域名覆盖连接目标。" @@ -1486,7 +1483,7 @@ msgstr "数据包编码" msgid "Password" msgstr "密码" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1013 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1010 #: htdocs/luci-static/resources/view/homeproxy/node.js:775 #: htdocs/luci-static/resources/view/homeproxy/node.js:808 #: htdocs/luci-static/resources/view/homeproxy/server.js:428 @@ -1498,7 +1495,7 @@ msgstr "路径" msgid "Peer pubkic key" msgstr "对端公钥" -#: htdocs/luci-static/resources/view/homeproxy/client.js:310 +#: htdocs/luci-static/resources/view/homeproxy/client.js:307 msgid "" "Performance may degrade slightly, so it is not recommended to enable on when " "it is not needed." @@ -1517,23 +1514,23 @@ msgstr "插件" msgid "Plugin opts" msgstr "插件参数" -#: htdocs/luci-static/resources/view/homeproxy/client.js:541 -#: htdocs/luci-static/resources/view/homeproxy/client.js:845 +#: htdocs/luci-static/resources/view/homeproxy/client.js:538 +#: htdocs/luci-static/resources/view/homeproxy/client.js:842 #: htdocs/luci-static/resources/view/homeproxy/node.js:418 msgid "Port" msgstr "端口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:251 +#: htdocs/luci-static/resources/view/homeproxy/client.js:248 msgid "Port %s alrealy exists!" msgstr "端口 %s 已存在！" -#: htdocs/luci-static/resources/view/homeproxy/client.js:446 -#: htdocs/luci-static/resources/view/homeproxy/client.js:778 +#: htdocs/luci-static/resources/view/homeproxy/client.js:443 +#: htdocs/luci-static/resources/view/homeproxy/client.js:775 msgid "Port fields" msgstr "端口字段" -#: htdocs/luci-static/resources/view/homeproxy/client.js:546 -#: htdocs/luci-static/resources/view/homeproxy/client.js:850 +#: htdocs/luci-static/resources/view/homeproxy/client.js:543 +#: htdocs/luci-static/resources/view/homeproxy/client.js:847 msgid "Port range" msgstr "端口范围" @@ -1549,8 +1546,8 @@ msgstr "优先 IPv4" msgid "Prefer IPv6" msgstr "优先 IPv6" -#: htdocs/luci-static/resources/view/homeproxy/client.js:525 -#: htdocs/luci-static/resources/view/homeproxy/client.js:870 +#: htdocs/luci-static/resources/view/homeproxy/client.js:522 +#: htdocs/luci-static/resources/view/homeproxy/client.js:867 msgid "Private IP" msgstr "私有 IP" @@ -1563,23 +1560,23 @@ msgstr "私钥" msgid "Private key passphrase" msgstr "私钥指纹" -#: htdocs/luci-static/resources/view/homeproxy/client.js:514 -#: htdocs/luci-static/resources/view/homeproxy/client.js:860 +#: htdocs/luci-static/resources/view/homeproxy/client.js:511 +#: htdocs/luci-static/resources/view/homeproxy/client.js:857 msgid "Private source IP" msgstr "私有源 IP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:551 -#: htdocs/luci-static/resources/view/homeproxy/client.js:885 +#: htdocs/luci-static/resources/view/homeproxy/client.js:548 +#: htdocs/luci-static/resources/view/homeproxy/client.js:882 msgid "Process name" msgstr "进程名" -#: htdocs/luci-static/resources/view/homeproxy/client.js:555 -#: htdocs/luci-static/resources/view/homeproxy/client.js:889 +#: htdocs/luci-static/resources/view/homeproxy/client.js:552 +#: htdocs/luci-static/resources/view/homeproxy/client.js:886 msgid "Process path" msgstr "进程路径" -#: htdocs/luci-static/resources/view/homeproxy/client.js:480 -#: htdocs/luci-static/resources/view/homeproxy/client.js:820 +#: htdocs/luci-static/resources/view/homeproxy/client.js:477 +#: htdocs/luci-static/resources/view/homeproxy/client.js:817 #: htdocs/luci-static/resources/view/homeproxy/node.js:480 #: htdocs/luci-static/resources/view/homeproxy/node.js:892 #: htdocs/luci-static/resources/view/homeproxy/server.js:220 @@ -1596,37 +1593,37 @@ msgid "" "default in v2ray and cannot be disabled)." msgstr "协议参数。 如启用会随机浪费流量（在 v2ray 中默认启用并且无法禁用）。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1149 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1146 msgid "Proxy Domain List" msgstr "代理域名列表" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1104 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1133 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1101 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1130 msgid "Proxy IPv4 IP-s" msgstr "代理 IPv4 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1107 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1136 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1104 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1133 msgid "Proxy IPv6 IP-s" msgstr "代理 IPv6 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1110 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1107 msgid "Proxy MAC-s" msgstr "代理 MAC 地址" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1091 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1088 msgid "Proxy all except listed" msgstr "仅允许列表外" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1088 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1085 msgid "Proxy filter mode" msgstr "代理过滤模式" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1090 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1087 msgid "Proxy listed only" msgstr "仅允许列表内" -#: htdocs/luci-static/resources/view/homeproxy/client.js:259 +#: htdocs/luci-static/resources/view/homeproxy/client.js:256 msgid "Proxy mode" msgstr "代理模式" @@ -1634,8 +1631,8 @@ msgstr "代理模式" msgid "Proxy protocol" msgstr "代理协议" -#: htdocs/luci-static/resources/view/homeproxy/client.js:484 -#: htdocs/luci-static/resources/view/homeproxy/client.js:824 +#: htdocs/luci-static/resources/view/homeproxy/client.js:481 +#: htdocs/luci-static/resources/view/homeproxy/client.js:821 #: htdocs/luci-static/resources/view/homeproxy/node.js:647 #: htdocs/luci-static/resources/view/homeproxy/node.js:717 #: htdocs/luci-static/resources/view/homeproxy/server.js:386 @@ -1661,11 +1658,11 @@ msgstr "QUIC 最大双向并发流" msgid "QUIC stream receive window" msgstr "QUIC 流接收窗口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:811 +#: htdocs/luci-static/resources/view/homeproxy/client.js:808 msgid "Query type" msgstr "请求类型" -#: htdocs/luci-static/resources/view/homeproxy/client.js:661 +#: htdocs/luci-static/resources/view/homeproxy/client.js:658 msgid "RDRC timeout" msgstr "RDRC 超时" @@ -1696,27 +1693,27 @@ msgstr "运行中" msgid "Random version will be used if empty." msgstr "如留空，则使用随机版本。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:423 +#: htdocs/luci-static/resources/view/homeproxy/client.js:420 msgid "Recursive outbound detected!" msgstr "检测到递归出站！" -#: htdocs/luci-static/resources/view/homeproxy/client.js:720 +#: htdocs/luci-static/resources/view/homeproxy/client.js:717 msgid "Recursive resolver detected!" msgstr "检测到递归解析器！" -#: htdocs/luci-static/resources/view/homeproxy/client.js:260 +#: htdocs/luci-static/resources/view/homeproxy/client.js:257 msgid "Redirect TCP" msgstr "Redirect TCP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:262 +#: htdocs/luci-static/resources/view/homeproxy/client.js:259 msgid "Redirect TCP + TProxy UDP" msgstr "Redirect TCP + TProxy UDP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:264 +#: htdocs/luci-static/resources/view/homeproxy/client.js:261 msgid "Redirect TCP + Tun UDP" msgstr "Redirect TCP + Tun UDP" -#: htdocs/luci-static/resources/view/homeproxy/status.js:170 +#: htdocs/luci-static/resources/view/homeproxy/status.js:171 msgid "Refresh every %s seconds." msgstr "每 %s 秒刷新。" @@ -1724,7 +1721,7 @@ msgstr "每 %s 秒刷新。" msgid "Region ID" msgstr "区域 ID" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1003 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1000 msgid "Remote" msgstr "远程" @@ -1740,27 +1737,27 @@ msgstr "移除所有订阅节点" msgid "Reserved field bytes" msgstr "保留字段字节" -#: htdocs/luci-static/resources/view/homeproxy/client.js:733 +#: htdocs/luci-static/resources/view/homeproxy/client.js:730 msgid "Resolve strategy" msgstr "解析策略" -#: htdocs/luci-static/resources/view/homeproxy/status.js:200 +#: htdocs/luci-static/resources/view/homeproxy/status.js:201 msgid "Resources management" msgstr "资源管理" -#: htdocs/luci-static/resources/view/homeproxy/client.js:965 +#: htdocs/luci-static/resources/view/homeproxy/client.js:962 msgid "Rewrite TTL" msgstr "重写 TTL" -#: htdocs/luci-static/resources/view/homeproxy/client.js:966 +#: htdocs/luci-static/resources/view/homeproxy/client.js:963 msgid "Rewrite TTL in DNS responses." msgstr "在 DNS 响应中重写 TTL。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:355 +#: htdocs/luci-static/resources/view/homeproxy/client.js:352 msgid "Routing Nodes" msgstr "路由节点" -#: htdocs/luci-static/resources/view/homeproxy/client.js:431 +#: htdocs/luci-static/resources/view/homeproxy/client.js:428 msgid "Routing Rules" msgstr "路由规则" @@ -1772,7 +1769,7 @@ msgstr "路由设置" msgid "Routing mode" msgstr "路由模式" -#: htdocs/luci-static/resources/view/homeproxy/client.js:364 +#: htdocs/luci-static/resources/view/homeproxy/client.js:361 msgid "Routing node" msgstr "路由节点" @@ -1780,32 +1777,32 @@ msgstr "路由节点" msgid "Routing ports" msgstr "路由端口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:440 +#: htdocs/luci-static/resources/view/homeproxy/client.js:437 msgid "Routing rule" msgstr "路由规则" -#: htdocs/luci-static/resources/view/homeproxy/client.js:563 -#: htdocs/luci-static/resources/view/homeproxy/client.js:897 -#: htdocs/luci-static/resources/view/homeproxy/client.js:978 -#: htdocs/luci-static/resources/view/homeproxy/client.js:987 +#: htdocs/luci-static/resources/view/homeproxy/client.js:560 +#: htdocs/luci-static/resources/view/homeproxy/client.js:894 +#: htdocs/luci-static/resources/view/homeproxy/client.js:975 +#: htdocs/luci-static/resources/view/homeproxy/client.js:984 msgid "Rule set" msgstr "规则集" -#: htdocs/luci-static/resources/view/homeproxy/client.js:913 +#: htdocs/luci-static/resources/view/homeproxy/client.js:910 msgid "Rule set IP CIDR as source IP" msgstr "规则集 IP CIDR 作为源 IP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1020 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1017 msgid "Rule set URL" msgstr "规则集 URL" -#: htdocs/luci-static/resources/view/homeproxy/client.js:447 -#: htdocs/luci-static/resources/view/homeproxy/client.js:779 +#: htdocs/luci-static/resources/view/homeproxy/client.js:444 +#: htdocs/luci-static/resources/view/homeproxy/client.js:776 msgid "SRC-IP fields" msgstr "源 IP 字段" -#: htdocs/luci-static/resources/view/homeproxy/client.js:448 -#: htdocs/luci-static/resources/view/homeproxy/client.js:780 +#: htdocs/luci-static/resources/view/homeproxy/client.js:445 +#: htdocs/luci-static/resources/view/homeproxy/client.js:777 msgid "SRC-Port fields" msgstr "源端口字段" @@ -1813,8 +1810,8 @@ msgstr "源端口字段" msgid "SSH" msgstr "SSH" -#: htdocs/luci-static/resources/view/homeproxy/client.js:485 -#: htdocs/luci-static/resources/view/homeproxy/client.js:826 +#: htdocs/luci-static/resources/view/homeproxy/client.js:482 +#: htdocs/luci-static/resources/view/homeproxy/client.js:823 msgid "STUN" msgstr "STUN" @@ -1839,7 +1836,7 @@ msgstr "保存当前设置" msgid "Save subscriptions settings" msgstr "保存订阅设置" -#: htdocs/luci-static/resources/view/homeproxy/client.js:941 +#: htdocs/luci-static/resources/view/homeproxy/client.js:938 #: htdocs/luci-static/resources/view/homeproxy/server.js:129 msgid "Server" msgstr "服务器" @@ -1875,8 +1872,8 @@ msgstr "ShadowTLS 版本" msgid "Shadowsocks" msgstr "Shadowsocks" -#: htdocs/luci-static/resources/view/homeproxy/client.js:481 -#: htdocs/luci-static/resources/view/homeproxy/client.js:821 +#: htdocs/luci-static/resources/view/homeproxy/client.js:478 +#: htdocs/luci-static/resources/view/homeproxy/client.js:818 msgid "" "Sniffed protocol, see Sniff for details." @@ -1905,22 +1902,22 @@ msgstr "Socks4A" msgid "Socks5" msgstr "Socks5" -#: htdocs/luci-static/resources/view/homeproxy/client.js:509 -#: htdocs/luci-static/resources/view/homeproxy/client.js:855 +#: htdocs/luci-static/resources/view/homeproxy/client.js:506 +#: htdocs/luci-static/resources/view/homeproxy/client.js:852 msgid "Source IP CIDR" msgstr "源 IP CIDR" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1008 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1005 msgid "Source file" msgstr "源文件" -#: htdocs/luci-static/resources/view/homeproxy/client.js:531 -#: htdocs/luci-static/resources/view/homeproxy/client.js:875 +#: htdocs/luci-static/resources/view/homeproxy/client.js:528 +#: htdocs/luci-static/resources/view/homeproxy/client.js:872 msgid "Source port" msgstr "源端口" -#: htdocs/luci-static/resources/view/homeproxy/client.js:536 -#: htdocs/luci-static/resources/view/homeproxy/client.js:880 +#: htdocs/luci-static/resources/view/homeproxy/client.js:533 +#: htdocs/luci-static/resources/view/homeproxy/client.js:877 msgid "Source port range" msgstr "源端口范围" @@ -1963,11 +1960,11 @@ msgid "" "commas." msgstr "指定需要被代理的目标端口。多个端口必须用逗号隔开。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:655 +#: htdocs/luci-static/resources/view/homeproxy/client.js:652 msgid "Store RDRC" msgstr "存储 RDRC" -#: htdocs/luci-static/resources/view/homeproxy/client.js:656 +#: htdocs/luci-static/resources/view/homeproxy/client.js:653 msgid "" "Store rejected DNS response cache.
The check results of Address " "filter DNS rule items will be cached until expiration." @@ -1996,7 +1993,7 @@ msgstr "订阅" msgid "Successfully imported %s nodes of total %s." msgstr "成功导入 %s 个节点，共 %s 个。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:85 +#: htdocs/luci-static/resources/view/homeproxy/status.js:86 msgid "Successfully updated." msgstr "更新成功。" @@ -2009,18 +2006,18 @@ msgstr "" "支持 Hysteria、Shadowsocks、Trojan、v2rayN（VMess）和 XTLS（VLESS）在线配置交" "付标准。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:294 +#: htdocs/luci-static/resources/view/homeproxy/client.js:291 msgid "System" msgstr "系统" -#: htdocs/luci-static/resources/view/homeproxy/client.js:626 -#: htdocs/luci-static/resources/view/homeproxy/client.js:703 -#: htdocs/luci-static/resources/view/homeproxy/client.js:948 +#: htdocs/luci-static/resources/view/homeproxy/client.js:623 +#: htdocs/luci-static/resources/view/homeproxy/client.js:700 +#: htdocs/luci-static/resources/view/homeproxy/client.js:945 msgid "System DNS" msgstr "系统 DNS" -#: htdocs/luci-static/resources/view/homeproxy/client.js:488 -#: htdocs/luci-static/resources/view/homeproxy/client.js:816 +#: htdocs/luci-static/resources/view/homeproxy/client.js:485 +#: htdocs/luci-static/resources/view/homeproxy/client.js:813 #: htdocs/luci-static/resources/view/homeproxy/server.js:800 msgid "TCP" msgstr "TCP" @@ -2030,16 +2027,16 @@ msgstr "TCP" msgid "TCP fast open" msgstr "TCP 快速打开" -#: htdocs/luci-static/resources/view/homeproxy/client.js:288 +#: htdocs/luci-static/resources/view/homeproxy/client.js:285 msgid "TCP/IP stack" msgstr "TCP/IP 协议栈" -#: htdocs/luci-static/resources/view/homeproxy/client.js:289 +#: htdocs/luci-static/resources/view/homeproxy/client.js:286 msgid "TCP/IP stack." msgstr "TCP/IP 协议栈。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:483 -#: htdocs/luci-static/resources/view/homeproxy/client.js:823 +#: htdocs/luci-static/resources/view/homeproxy/client.js:480 +#: htdocs/luci-static/resources/view/homeproxy/client.js:820 #: htdocs/luci-static/resources/view/homeproxy/node.js:945 #: htdocs/luci-static/resources/view/homeproxy/server.js:516 msgid "TLS" @@ -2060,7 +2057,7 @@ msgstr "TLS SNI" msgid "TLS is not enforced. If TLS is not configured, plain HTTP 1.1 is used." msgstr "不强制执行 TLS。如未配置 TLS，将使用纯 HTTP 1.1。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:696 +#: htdocs/luci-static/resources/view/homeproxy/client.js:693 msgid "" "Tag of a another server to resolve the domain name in the address. Required " "if address contains domain." @@ -2068,19 +2065,19 @@ msgstr "" "用于解析本 DNS 服务器的域名的另一个 DNS 服务器的标签。如果服务器地址包括域名" "则必须。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:739 +#: htdocs/luci-static/resources/view/homeproxy/client.js:736 msgid "Tag of an outbound for connecting to the dns server." msgstr "用于连接到 DNS 服务器的出站标签。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1043 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1040 msgid "Tag of the outbound to download rule set." msgstr "用于下载规则集的出站标签。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:942 +#: htdocs/luci-static/resources/view/homeproxy/client.js:939 msgid "Tag of the target dns server." msgstr "目标 DNS 服务器标签。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:591 +#: htdocs/luci-static/resources/view/homeproxy/client.js:588 msgid "Tag of the target outbound." msgstr "目标出站标签。" @@ -2098,7 +2095,7 @@ msgstr "腾讯公共 DNS（119.29.29.29）" msgid "The ACME CA provider to use." msgstr "使用的 ACME CA 颁发机构。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:616 +#: htdocs/luci-static/resources/view/homeproxy/client.js:613 msgid "The DNS strategy for resolving the domain name in the address." msgstr "解析域名的默认策略。" @@ -2112,7 +2109,7 @@ msgstr "用于接收数据的 QUIC 连接级流控制窗口。" msgid "The QUIC stream-level flow control window for receiving data." msgstr "用于接收数据的 QUIC 流级流控制窗口。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:692 +#: htdocs/luci-static/resources/view/homeproxy/client.js:689 msgid "The address of the dns server. Support UDP, TCP, DoT, DoH and RCode." msgstr "DNS 服务器的地址。支持 UDP、TCP、DoT、DoH 和 RCode。" @@ -2131,7 +2128,7 @@ msgid "" msgstr "" "用于 ACME TLS-ALPN 质询的备用端口； 系统必须将 443 转发到此端口以使质询成功。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:461 +#: htdocs/luci-static/resources/view/homeproxy/client.js:458 msgid "" "The default rule uses the following matching logic:
(domain || " "domain_suffix || domain_keyword || domain_regex || ip_cidr || " @@ -2148,7 +2145,7 @@ msgstr "" "source_port_range) &&
其他字段。此外，包含的所有规则" "集会被合并而不是独立生效。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:793 +#: htdocs/luci-static/resources/view/homeproxy/client.js:790 msgid "" "The default rule uses the following matching logic:
(domain || " "domain_suffix || domain_keyword || domain_regex) &&
(port " @@ -2163,11 +2160,9 @@ msgstr "" ">(source_port || source_port_range) &&
其他字段。此外，包含的所有规则集会被合并而不是独立生效。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:728 -msgid "" -"The domain strategy for resolving the domain name in the address. dns." -"strategy will be used if empty." -msgstr "用于解析本 DNS 服务器的域名的策略。默认使用 dns.strategy。" +#: htdocs/luci-static/resources/view/homeproxy/client.js:725 +msgid "The domain strategy for resolving the domain name in the address." +msgstr "用于解析本 DNS 服务器的域名的策略。" #: htdocs/luci-static/resources/view/homeproxy/node.js:1008 #: htdocs/luci-static/resources/view/homeproxy/server.js:570 @@ -2202,12 +2197,12 @@ msgstr "服务器和客户端之间的最大时间差。" msgid "The minimum TLS version that is acceptable." msgstr "可接受的最低 TLS 版本。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:110 +#: htdocs/luci-static/resources/view/homeproxy/client.js:121 #: htdocs/luci-static/resources/view/homeproxy/server.js:98 msgid "The modern ImmortalWrt proxy platform for ARM64/AMD64." msgstr "为 ARM64/AMD64 设计的现代 ImmortalWrt 代理平台。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:392 +#: htdocs/luci-static/resources/view/homeproxy/client.js:389 msgid "The network interface to bind to." msgstr "绑定到的网络接口。" @@ -2227,7 +2222,7 @@ msgstr "服务端私钥，需要 PEM 格式。" msgid "The server public key, in PEM format." msgstr "服务端公钥，需要 PEM 格式。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:399 +#: htdocs/luci-static/resources/view/homeproxy/client.js:396 msgid "" "The tag of the upstream outbound.
Other dial fields will be ignored when " "enabled." @@ -2264,7 +2259,7 @@ msgstr "" msgid "ThreatBook Public DNS (117.50.10.10)" msgstr "微步在线公共 DNS（117.50.10.10）" -#: htdocs/luci-static/resources/view/homeproxy/client.js:662 +#: htdocs/luci-static/resources/view/homeproxy/client.js:659 msgid "" "Timeout of rejected DNS response cache. 7d is used by default." msgstr "被拒绝的 DNS 响应缓存超时。默认时长 7d。" @@ -2276,7 +2271,7 @@ msgid "" msgstr "" "要与 Xray-core 兼容，请将其设置为 Sec-WebSocket-Protocol。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:267 +#: htdocs/luci-static/resources/view/homeproxy/client.js:264 msgid "" "To enable Tun support, you need to install ip-full and " "kmod-tun" @@ -2298,18 +2293,18 @@ msgstr "Trojan" msgid "Tuic" msgstr "Tuic" -#: htdocs/luci-static/resources/view/homeproxy/client.js:265 +#: htdocs/luci-static/resources/view/homeproxy/client.js:262 msgid "Tun TCP/UDP" msgstr "Tun TCP/UDP" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1001 +#: htdocs/luci-static/resources/view/homeproxy/client.js:998 #: htdocs/luci-static/resources/view/homeproxy/node.js:393 #: htdocs/luci-static/resources/view/homeproxy/server.js:144 msgid "Type" msgstr "类型" -#: htdocs/luci-static/resources/view/homeproxy/client.js:489 -#: htdocs/luci-static/resources/view/homeproxy/client.js:817 +#: htdocs/luci-static/resources/view/homeproxy/client.js:486 +#: htdocs/luci-static/resources/view/homeproxy/client.js:814 #: htdocs/luci-static/resources/view/homeproxy/server.js:801 msgid "UDP" msgstr "UDP" @@ -2319,7 +2314,7 @@ msgstr "UDP" msgid "UDP Fragment" msgstr "UDP 分片" -#: htdocs/luci-static/resources/view/homeproxy/client.js:316 +#: htdocs/luci-static/resources/view/homeproxy/client.js:313 #: htdocs/luci-static/resources/view/homeproxy/server.js:782 msgid "UDP NAT expiration time" msgstr "UDP NAT 过期时间" @@ -2345,11 +2340,11 @@ msgstr "UDP 中继模式" msgid "UUID" msgstr "UUID" -#: htdocs/luci-static/resources/view/homeproxy/status.js:97 +#: htdocs/luci-static/resources/view/homeproxy/status.js:98 msgid "Unknown error." msgstr "未知错误。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:147 +#: htdocs/luci-static/resources/view/homeproxy/status.js:148 msgid "Unknown error: %s" msgstr "未知错误：%s" @@ -2361,15 +2356,15 @@ msgstr "不支持的指纹！" msgid "Update %s subscriptions" msgstr "更新 %s 个订阅" -#: htdocs/luci-static/resources/view/homeproxy/status.js:88 +#: htdocs/luci-static/resources/view/homeproxy/status.js:89 msgid "Update failed." msgstr "更新失败。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1060 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1057 msgid "Update interval" msgstr "更新间隔" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1061 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1058 msgid "Update interval of rule set.
1d will be used if empty." msgstr "规则集更新间隔。
留空使用 1d。" @@ -2425,8 +2420,8 @@ msgid "" "given." msgstr "用于验证返回证书上的主机名。如允许不安全连接，此配置无效。" -#: htdocs/luci-static/resources/view/homeproxy/client.js:559 -#: htdocs/luci-static/resources/view/homeproxy/client.js:893 +#: htdocs/luci-static/resources/view/homeproxy/client.js:556 +#: htdocs/luci-static/resources/view/homeproxy/client.js:890 msgid "User" msgstr "用户" @@ -2450,7 +2445,7 @@ msgstr "VMess" msgid "WAN DNS (read from interface)" msgstr "WAN DNS（从接口获取）" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1131 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1128 msgid "WAN IP Policy" msgstr "WAN IP 策略" @@ -2512,7 +2507,7 @@ msgstr "证书" msgid "default" msgstr "默认" -#: htdocs/luci-static/resources/view/homeproxy/status.js:52 +#: htdocs/luci-static/resources/view/homeproxy/status.js:53 msgid "failed" msgstr "失败" @@ -2530,14 +2525,14 @@ msgstr "gRPC 允许无活动连接" msgid "gRPC service name" msgstr "gRPC 服务名称" -#: htdocs/luci-static/resources/view/homeproxy/client.js:292 +#: htdocs/luci-static/resources/view/homeproxy/client.js:289 msgid "gVisor" msgstr "gVisor" #: htdocs/luci-static/resources/homeproxy.js:263 #: htdocs/luci-static/resources/homeproxy.js:281 #: htdocs/luci-static/resources/view/homeproxy/client.js:176 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1024 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1021 #: htdocs/luci-static/resources/view/homeproxy/node.js:452 #: htdocs/luci-static/resources/view/homeproxy/node.js:1082 #: htdocs/luci-static/resources/view/homeproxy/server.js:211 @@ -2555,7 +2550,7 @@ msgstr "无" msgid "packet addr (v2ray-core v5+)" msgstr "packet addr (v2ray-core v5+)" -#: htdocs/luci-static/resources/view/homeproxy/status.js:49 +#: htdocs/luci-static/resources/view/homeproxy/status.js:50 msgid "passed" msgstr "通过" @@ -2563,11 +2558,11 @@ msgstr "通过" msgid "private key" msgstr "私钥" -#: htdocs/luci-static/resources/view/homeproxy/status.js:226 +#: htdocs/luci-static/resources/view/homeproxy/status.js:227 msgid "sing-box client" msgstr "sing-box 客户端" -#: htdocs/luci-static/resources/view/homeproxy/status.js:229 +#: htdocs/luci-static/resources/view/homeproxy/status.js:230 msgid "sing-box server" msgstr "sing-box 服务端" @@ -2582,7 +2577,7 @@ msgid "" msgstr "" "uTLS 是 \"crypto/tls\" 的一个分支，拥有抵抗 ClientHello 指纹识别的能力。" -#: htdocs/luci-static/resources/view/homeproxy/status.js:58 +#: htdocs/luci-static/resources/view/homeproxy/status.js:59 msgid "unchecked" msgstr "未检查" @@ -2615,8 +2610,8 @@ msgstr "v3" msgid "valid IP address" msgstr "有效 IP 地址" +#: htdocs/luci-static/resources/view/homeproxy/client.js:1026 #: htdocs/luci-static/resources/view/homeproxy/client.js:1029 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1032 #: htdocs/luci-static/resources/view/homeproxy/node.js:1311 #: htdocs/luci-static/resources/view/homeproxy/node.js:1314 msgid "valid URL" @@ -2630,8 +2625,8 @@ msgstr "有效 地址#端口" msgid "valid base64 key with %d characters" msgstr "包含 %d 个字符的有效 base64 密钥" -#: htdocs/luci-static/resources/view/homeproxy/client.js:1171 -#: htdocs/luci-static/resources/view/homeproxy/client.js:1200 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1168 +#: htdocs/luci-static/resources/view/homeproxy/client.js:1197 msgid "valid hostname" msgstr "有效主机名" @@ -2639,8 +2634,7 @@ msgstr "有效主机名" msgid "valid port range (port1:port2)" msgstr "有效端口范围（port1:port2）" -#: htdocs/luci-static/resources/view/homeproxy/client.js:244 -#: htdocs/luci-static/resources/view/homeproxy/client.js:249 +#: htdocs/luci-static/resources/view/homeproxy/client.js:246 msgid "valid port value" msgstr "有效端口值" diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut index 2be02273bf..3359e988be 100755 --- a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut +++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut @@ -50,7 +50,7 @@ if (routing_mode !== 'custom') { bypass_cn_traffic = uci.get(cfgname, 'routing', 'bypass_cn_traffic') || '0'; } -let routing_port = uci.get(cfgname, 'config', 'routing_port') || 'common'; +let routing_port = uci.get(cfgname, 'config', 'routing_port'); if (routing_port === 'common') routing_port = uci.get(cfgname, 'infra', 'common_port') || '22,53,80,143,443,465,587,853,873,993,995,8080,8443,9418'; @@ -222,7 +222,7 @@ set homeproxy_wan_direct_addr_v6 { } {% endif /* ipv6_support */ %} -{% if (routing_port !== 'all'): %} +{% if (routing_port): %} set homeproxy_routing_port { type inet_service flags interval @@ -248,7 +248,7 @@ chain homeproxy_redirect_proxy { } chain homeproxy_redirect_proxy_port { - {% if (routing_port !== 'all'): %} + {% if (routing_port): %} tcp dport != @homeproxy_routing_port counter return {% endif %} goto homeproxy_redirect_proxy @@ -363,14 +363,14 @@ chain homeproxy_mangle_tproxy { } chain homeproxy_mangle_tproxy_port { - {% if (routing_port !== 'all'): %} + {% if (routing_port): %} udp dport != @homeproxy_routing_port counter return {% endif %} goto homeproxy_mangle_tproxy } chain homeproxy_mangle_mark { - {% if (routing_port !== 'all'): %} + {% if (routing_port): %} udp dport != @homeproxy_routing_port counter return {% endif %} meta l4proto udp mark set {{ tproxy_mark }} counter accept @@ -557,7 +557,7 @@ chain homeproxy_mangle_lanac { } chain homeproxy_mangle_tun_mark { - {% if (routing_port !== 'all'): %} + {% if (routing_port): %} {% if (proxy_mode === 'tun'): %} tcp dport != @homeproxy_routing_port counter return {% endif /* proxy_mode */ %} diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc index 3c4f3983be..996bebc02b 100755 --- a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc +++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc @@ -543,7 +543,10 @@ function main() { log(sprintf('Removing node: %s.', cfg.label || cfg['name'])); } else { map(keys(node_cache[cfg.grouphash][cfg['.name']]), (v) => { - uci.set(uciconfig, cfg['.name'], v, node_cache[cfg.grouphash][cfg['.name']][v]); + if (v in node_cache[cfg.grouphash][cfg['.name']]) + uci.set(uciconfig, cfg['.name'], v, node_cache[cfg.grouphash][cfg['.name']][v]); + else + uci.delete(uciconfig, cfg['.name'], v); }); node_cache[cfg.grouphash][cfg['.name']].isExisting = true; } diff --git a/luci-app-homeproxy/root/etc/uci-defaults/luci-homeproxy-migration b/luci-app-homeproxy/root/etc/uci-defaults/luci-homeproxy-migration index 43f7e5a240..e3a268eda7 100644 --- a/luci-app-homeproxy/root/etc/uci-defaults/luci-homeproxy-migration +++ b/luci-app-homeproxy/root/etc/uci-defaults/luci-homeproxy-migration @@ -11,6 +11,11 @@ elif echo "$china_dns_server" | grep -q ","; then uci -q add_list "homeproxy.config.china_dns_server"="$dns" done fi + +if [ "$(uci -q get homeproxy.config.routing_port)" = "all" ]; then + uci -q delete "homeproxy.config.routing_port" +fi + [ -z "$(uci -q changes "homeproxy")" ] || uci -q commit "homeproxy" exit 0 diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 806095faec..4f8f1b9051 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -7,6 +7,7 @@ local has_xray = api.finded_com("xray") local has_gfwlist = api.fs.access("/usr/share/passwall/rules/gfwlist") local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist") local has_chnroute = api.fs.access("/usr/share/passwall/rules/chnroute") +local chinadns_tls = os.execute("chinadns-ng -V | grep -i wolfssl >/dev/null") m = Map(appname) @@ -63,8 +64,8 @@ uci:foreach(appname, "socks", function(s) end) local doh_validate = function(self, value, t) + value = value:gsub("%s+", "") if value ~= "" then - value = api.trim(value) local flag = 0 local util = require "luci.util" local val = util.split(value, ",") @@ -103,8 +104,8 @@ local chinadns_dot_validate = function(self, value, t) end return true end + value = value:gsub("%s+", "") if value ~= "" then - value = api.trim(value) if isValidDoTString(value) then return value end @@ -298,7 +299,7 @@ o.default = "" o:value("", translate("Auto")) o:value("udp", translatef("Requery DNS By %s", "UDP")) o:value("tcp", translatef("Requery DNS By %s", "TCP")) -if os.execute("chinadns-ng -V | grep -i wolfssl >/dev/null") == 0 then +if chinadns_tls == 0 then o:value("dot", translatef("Requery DNS By %s", "DoT")) end --TO DO @@ -326,7 +327,7 @@ o:value("180.184.1.1") o:value("180.184.2.2") o:depends("direct_dns_mode", "tcp") -o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS")) +o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) o.default = "tls://dot.pub@1.12.12.12" o:value("tls://dot.pub@1.12.12.12") o:value("tls://dot.pub@120.53.53.53") @@ -344,6 +345,9 @@ o.default = "0" dns_mode = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode")) dns_mode:value("udp", translatef("Requery DNS By %s", "UDP")) dns_mode:value("tcp", translatef("Requery DNS By %s", "TCP")) +if chinadns_tls == 0 then + dns_mode:value("dot", translatef("Requery DNS By %s", "DoT")) +end if api.is_finded("dns2socks") then dns_mode:value("dns2socks", "dns2socks") end @@ -399,8 +403,8 @@ o:value("1.1.1.1", "1.1.1.1 (CloudFlare)") o:value("1.1.1.2", "1.1.1.2 (CloudFlare-Security)") o:value("8.8.4.4", "8.8.4.4 (Google)") o:value("8.8.8.8", "8.8.8.8 (Google)") -o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)") -o:value("149.112.112.112", "149.112.112.112 (Quad9-Recommended)") +o:value("9.9.9.9", "9.9.9.9 (Quad9)") +o:value("149.112.112.112", "149.112.112.112 (Quad9)") o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") o:depends({dns_mode = "dns2socks"}) @@ -410,19 +414,35 @@ o:depends({xray_dns_mode = "tcp"}) o:depends({xray_dns_mode = "tcp+doh"}) o:depends({singbox_dns_mode = "tcp"}) +---- DoT +o = s:taboption("DNS", Value, "remote_dns_dot", translate("Remote DNS DoT")) +o.default = "tls://dns.google@8.8.4.4" +o:value("tls://1dot1dot1dot1.cloudflare-dns.com@1.0.0.1", "1.0.0.1 (CloudFlare)") +o:value("tls://1dot1dot1dot1.cloudflare-dns.com@1.1.1.1", "1.1.1.1 (CloudFlare)") +o:value("tls://dns.google@8.8.4.4", "8.8.4.4 (Google)") +o:value("tls://dns.google@8.8.8.8", "8.8.8.8 (Google)") +o:value("tls://dns.quad9.net@9.9.9.9", "9.9.9.9 (Quad9)") +o:value("tls://dns.quad9.net@149.112.112.112", "149.112.112.112 (Quad9)") +o:value("tls://dns.adguard.com@94.140.14.14", "94.140.14.14 (AdGuard)") +o:value("tls://dns.adguard.com@94.140.15.15", "94.140.15.15 (AdGuard)") +o:value("tls://dns.opendns.com@208.67.222.222", "208.67.222.222 (OpenDNS)") +o:value("tls://dns.opendns.com@208.67.220.220", "208.67.220.220 (OpenDNS)") +o.validate = chinadns_dot_validate +o:depends("dns_mode", "dot") + ---- DoH o = s:taboption("DNS", Value, "remote_dns_doh", translate("Remote DNS DoH")) o.default = "https://1.1.1.1/dns-query" -o:value("https://1.1.1.1/dns-query", "CloudFlare") -o:value("https://1.1.1.2/dns-query", "CloudFlare-Security") -o:value("https://8.8.4.4/dns-query", "Google 8844") -o:value("https://8.8.8.8/dns-query", "Google 8888") -o:value("https://9.9.9.9/dns-query", "Quad9-Recommended 9.9.9.9") -o:value("https://149.112.112.112/dns-query", "Quad9-Recommended 149.112.112.112") -o:value("https://208.67.222.222/dns-query", "OpenDNS") -o:value("https://dns.adguard.com/dns-query,176.103.130.130", "AdGuard") -o:value("https://doh.libredns.gr/dns-query,116.202.176.26", "LibreDNS") -o:value("https://doh.libredns.gr/ads,116.202.176.26", "LibreDNS (No Ads)") +o:value("https://1.1.1.1/dns-query", "1.1.1.1 (CloudFlare)") +o:value("https://1.1.1.2/dns-query", "1.1.1.2 (CloudFlare-Security)") +o:value("https://8.8.4.4/dns-query", "8.8.4.4 (Google)") +o:value("https://8.8.8.8/dns-query", "8.8.8.8 (Google)") +o:value("https://9.9.9.9/dns-query", "9.9.9.9 (Quad9)") +o:value("https://149.112.112.112/dns-query", "149.112.112.112 (Quad9)") +o:value("https://208.67.222.222/dns-query", "208.67.222.222 (OpenDNS)") +o:value("https://dns.adguard.com/dns-query,94.140.14.14", "94.140.14.14 (AdGuard)") +o:value("https://doh.libredns.gr/dns-query,116.202.176.26", "116.202.176.26 (LibreDNS)") +o:value("https://doh.libredns.gr/ads,116.202.176.26", "116.202.176.26 (LibreDNS-NoAds)") o.validate = doh_validate o:depends({xray_dns_mode = "tcp+doh"}) o:depends({singbox_dns_mode = "doh"}) diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 962ad13b6f..82f6325611 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -124,6 +124,9 @@ msgstr "TCP 节点必须是 '%s' 类型才能使用 FakeDNS。" msgid "Direct DNS" msgstr "直连 DNS" +msgid "Direct DNS DoT" +msgstr "直连 DNS DoT" + msgid "Remote DNS" msgstr "远程 DNS" @@ -154,6 +157,9 @@ msgstr "请求协议" msgid "Remote DNS DoH" msgstr "远程 DNS DoH" +msgid "Remote DNS DoT" +msgstr "远程 DNS DoT" + msgid "Notify the DNS server when the DNS query is notified, the location of the client (cannot be a private IP address)." msgstr "用于 DNS 查询时通知 DNS 服务器，客户端所在的地理位置（不能是私有 IP 地址）。" diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index 8a18ffabb4..a1cc5bcb9d 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -1370,6 +1370,7 @@ stop_crontab() { start_dns() { echolog "DNS域名解析：" + local chinadns_tls=$(chinadns-ng -V | grep -i wolfssl) local china_ng_local_dns=$(IFS=','; set -- $LOCAL_DNS; [ "${1%%[#:]*}" = "127.0.0.1" ] && echo "$1" || ([ -n "$2" ] && echo "$1,$2" || echo "$1")) local sing_box_local_dns= local direct_dns_mode=$(config_t_get global direct_dns_mode "auto") @@ -1392,7 +1393,7 @@ start_dns() { echolog " * 请确保上游直连 DNS 支持 TCP 查询。" ;; dot) - if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then + if [ "$chinadns_tls" != "nil" ]; then LOCAL_DNS="127.0.0.1#${dns_listen_port}" local cdns_listen_port=${dns_listen_port} dns_listen_port=$(expr $dns_listen_port + 1) @@ -1489,6 +1490,39 @@ start_dns() { run_xray ${_args} } ;; + dot) + use_tcp_node_resolve_dns=1 + if [ "$chinadns_tls" != "nil" ]; then + if [ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ]; then + local china_ng_listen_port=${dns_listen_port} + local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://dns.google@8.8.4.4") + local tmp_dot_ip=$(echo "$china_ng_trust_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p') + local tmp_dot_port=$(echo "$china_ng_trust_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p') + REMOTE_DNS="$tmp_dot_ip#${tmp_dot_port:-853}" + else + local china_ng_listen_port=${dns_listen_port} + local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://dns.google@8.8.4.4") + ln_run "$(first_type chinadns-ng)" chinadns-ng "/dev/null" -b 127.0.0.1 -l ${china_ng_listen_port} -t ${china_ng_trust_dns} -d gfw + echolog " - ChinaDNS-NG(${TUN_DNS}) -> ${china_ng_trust_dns}" + + local tmp_dot_ip=$(echo "$china_ng_trust_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p') + local tmp_dot_port=$(echo "$china_ng_trust_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p') + REMOTE_DNS="$tmp_dot_ip#${tmp_dot_port:-853}" + fi + else + echolog " - 你的ChinaDNS-NG版本不支持DoT，远程DNS将默认使用tcp://1.1.1.1" + + if [ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ]; then + local china_ng_listen_port=${dns_listen_port} + local china_ng_trust_dns="tcp://1.1.1.1" + REMOTE_DNS="1.1.1.1" + else + REMOTE_DNS="1.1.1.1" + ln_run "$(first_type dns2tcp)" dns2tcp "/dev/null" -L "${TUN_DNS}" -R "$(get_first_dns REMOTE_DNS 53)" -v + echolog " - dns2tcp(${TUN_DNS}) -> tcp://$(get_first_dns REMOTE_DNS 53 | sed 's/#/:/g')" + fi + fi + ;; udp) use_udp_node_resolve_dns=1 if [ "$DNS_SHUNT" = "chinadns-ng" ] && [ -n "$(first_type chinadns-ng)" ]; then