diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile index e02e7d50..f0848171 100644 --- a/luci-app-mosdns/Makefile +++ b/luci-app-mosdns/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-mosdns -PKG_VERSION:=1.7.3 +PKG_VERSION:=1.7.4 PKG_RELEASE:=1 LUCI_TITLE:=LuCI Support for mosdns diff --git a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js index 92b8daf0..8d9adc02 100644 --- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js +++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js @@ -147,6 +147,7 @@ return view.extend({ o.value('/var/etc/mosdns.json', _('Default Config')); o.value('/etc/mosdns/config_custom.yaml', _('Custom Config')); o.default = '/var/etc/mosdns.json'; + o.rmempty = false; o = s.taboption('basic', form.Value, 'listen_port', _('Listen Port')); o.default = '5335'; @@ -169,6 +170,7 @@ return view.extend({ o.placeholder = '/var/log/mosdns.log'; o.default = '/var/log/mosdns.log'; o.depends('configfile', '/var/etc/mosdns.json'); + o.rmempty = false; o = s.taboption('basic', form.Flag, 'redirect', _('DNS Forward'), _('Forward Dnsmasq Domain Name resolution requests to MosDNS')); o.default = false; diff --git a/luci-app-mosdns/po/templates/mosdns.pot b/luci-app-mosdns/po/templates/mosdns.pot index a7ab71e6..aa79b681 100644 --- a/luci-app-mosdns/po/templates/mosdns.pot +++ b/luci-app-mosdns/po/templates/mosdns.pot @@ -1,15 +1,15 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:217 msgid "360 Public DNS (DNS over HTTPS)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:354 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:356 msgid "ADblock Source" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:393 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:395 msgid "API Listen port" msgstr "" @@ -52,25 +52,25 @@ msgstr "" msgid "Advanced Options" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:204 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:206 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:254 msgid "Aliyun Public DNS (223.5.5.5)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:207 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:255 msgid "Aliyun Public DNS (223.6.6.6)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:216 msgid "Aliyun Public DNS (DNS over HTTP/3)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215 msgid "Aliyun Public DNS (DNS over HTTPS)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:212 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214 msgid "Aliyun Public DNS (DNS over QUIC)" msgstr "" @@ -78,11 +78,11 @@ msgstr "" msgid "Another update is already in progress." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:196 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:198 msgid "Apple domains optimization" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:328 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:330 msgid "Auto Save Cache Interval" msgstr "" @@ -92,8 +92,8 @@ msgid "" "rules through scheduled tasks." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:210 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:212 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:258 msgid "Baidu Public DNS (180.76.76.76)" msgstr "" @@ -105,7 +105,7 @@ msgstr "" msgid "Basic Setting" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:346 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:348 msgid "" "Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force " "using only A/AAAA records." @@ -119,17 +119,17 @@ msgstr "" msgid "Block PTR" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:248 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:250 msgid "Bootstrap DNS servers" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:249 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:251 msgid "" "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT " "resolvers you specify as upstreams" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:321 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:323 msgid "Cache Dump" msgstr "" @@ -141,21 +141,21 @@ msgstr "" msgid "Check And Update GeoData." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:182 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:184 msgid "China DNS prefer IPv4" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:201 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:203 msgid "China DNS server" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:227 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:244 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:229 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:246 msgid "Cisco Public DNS (208.67.220.220)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:226 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:243 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:228 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:245 msgid "Cisco Public DNS (208.67.222.222)" msgstr "" @@ -167,18 +167,18 @@ msgstr "" msgid "Close" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:221 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:238 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240 msgid "CloudFlare Public DNS (1.0.0.1)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:220 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:237 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:258 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:222 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:239 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:260 msgid "CloudFlare Public DNS (1.1.1.1)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:378 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:380 msgid "Cloudflare IP Ranges" msgstr "" @@ -190,7 +190,7 @@ msgstr "" msgid "Collecting data..." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:263 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:265 msgid "Concurrent" msgstr "" @@ -198,11 +198,11 @@ msgstr "" msgid "Config File" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:424 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:426 msgid "Configuration Editor" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:192 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:194 msgid "Custom China DNS" msgstr "" @@ -216,11 +216,11 @@ msgid "" "supports domain matching rules)." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:373 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:375 msgid "Custom IP" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:231 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:233 msgid "Custom Stream Media DNS" msgstr "" @@ -228,21 +228,21 @@ msgstr "" msgid "DDNS Lists" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:310 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:312 msgid "DNS Cache Size" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:173 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:175 msgid "DNS Forward" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:264 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:266 msgid "" "DNS query request concurrency, The number of upstream DNS servers that are " "allowed to initiate requests at the same time" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:179 msgid "DNS redirect" msgstr "" @@ -250,7 +250,7 @@ msgstr "" msgid "Database Update" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:161 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:162 msgid "Debug" msgstr "" @@ -258,21 +258,21 @@ msgstr "" msgid "Default Config" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:345 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:347 msgid "Disable RR Type 65 (HTTPS/SVCB)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:281 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:283 msgid "Disable TLS Certificate" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:282 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:284 msgid "" "Disable TLS Servers certificate validation, Can be useful if system CA " "certificate expires or the system time is out of order" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:270 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:272 msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)" msgstr "" @@ -280,41 +280,41 @@ msgstr "" msgid "Enable Auto Database Update" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:350 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:352 msgid "Enable DNS ADblock" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:305 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:307 msgid "Enable DNS Cache" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:288 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:290 msgid "Enable EDNS client subnet" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:276 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:278 msgid "" "Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:300 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:302 msgid "Enable this option fallback policy forces forwarding to remote DNS" msgstr "" #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:142 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:366 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:368 msgid "Enabled" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:451 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:453 msgid "Enter the GeoIP.dat category to be exported, Allow add multiple tags" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:446 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:448 msgid "Enter the GeoSite.dat category to be exported, Allow add multiple tags" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:165 msgid "Error" msgstr "" @@ -350,8 +350,8 @@ msgstr "" msgid "Every Wednesday" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:447 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:452 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:449 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:454 msgid "Export directory: /var/mosdns" msgstr "" @@ -363,7 +363,7 @@ msgstr "" msgid "Failed to start update." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:401 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:403 msgid "Flush DNS Cache" msgstr "" @@ -375,27 +375,27 @@ msgstr "" msgid "Flushing DNS Cache Success." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:399 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:401 msgid "" "Flushing DNS Cache will clear any IP addresses or DNS records from MosDNS " "cache." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:192 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:194 msgid "Follow WAN interface DNS if not enabled" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:197 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:199 msgid "" "For Apple domains equipped with Chinese mainland CDN, always responsive to " "Chinese CDN IP addresses" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:179 msgid "Force redirect all local DNS queries to MosDNS, a.k.a. DNS Hijacking" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:173 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:175 msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS" msgstr "" @@ -411,7 +411,7 @@ msgstr "" msgid "GeoData Export" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:450 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:452 msgid "GeoIP Tags" msgstr "" @@ -419,7 +419,7 @@ msgstr "" msgid "GeoIP Type" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:445 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:447 msgid "GeoSite Tags" msgstr "" @@ -431,14 +431,14 @@ msgstr "" msgid "GitHub Proxy" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:225 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:242 msgid "Google Public DNS (8.8.4.4)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:222 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:239 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:224 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:241 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:259 msgid "Google Public DNS (8.8.8.8)" msgstr "" @@ -454,11 +454,11 @@ msgstr "" msgid "Hosts" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:293 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:295 msgid "IP Address" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:379 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:381 msgid "" "IPv4 CIDR: https://www.cloudflare.com/ips-v4
IPv6 CIDR: " msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:183 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:185 msgid "" "IPv4 is preferred for China DNS resolution of dual-stack addresses, and is " "not affected when the destination is IPv6 only" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:188 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:190 msgid "" "IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack " "addresses, and is not affected when the destination is IPv6 only" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:269 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:271 msgid "Idle Timeout" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:162 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:163 msgid "Info" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:315 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:317 msgid "Lazy Cache TTL" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:316 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:318 msgid "" "Lazy cache survival time (in second). To disable Lazy Cache, please set to 0." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:156 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:157 msgid "Listen Address" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:151 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:152 msgid "Listen Port" msgstr "" @@ -515,11 +515,11 @@ msgstr "" msgid "Log Data" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:168 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:169 msgid "Log File" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:160 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:161 msgid "Log Level" msgstr "" @@ -527,28 +527,28 @@ msgstr "" msgid "Logs" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:367 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:369 msgid "" "Match the parsing result with the Cloudflare IP ranges, and when there is a " "successful match, use the 'Custom IP' as the parsing result (experimental " "feature)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:339 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:341 msgid "Maximum TTL" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:333 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:335 msgid "Minimum TTL" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:340 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:342 msgid "" "Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating " "no modification" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:334 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:336 msgid "" "Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating " "no modification" @@ -570,7 +570,7 @@ msgstr "" msgid "NOT RUNNING" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:232 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:234 msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS" msgstr "" @@ -578,7 +578,7 @@ msgstr "" msgid "No log data." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:294 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:296 msgid "" "Please provide the IP address you use when accessing foreign websites. This " "IP subnet (0/24) will be used as the ECS address for Remote / Streaming " @@ -589,17 +589,17 @@ msgstr "" msgid "Please wait, this may take a few moments..." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:299 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:301 msgid "Prevent DNS Leaks" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:225 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:242 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:227 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:244 msgid "Quad9 Public DNS (149.112.112.112)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:224 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:241 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:226 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:243 msgid "Quad9 Public DNS (9.9.9.9)" msgstr "" @@ -621,11 +621,11 @@ msgstr "" msgid "Refresh every %s seconds." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:187 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:189 msgid "Remote DNS prefer IPv4" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:219 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:221 msgid "Remote DNS server" msgstr "" @@ -637,7 +637,7 @@ msgstr "" msgid "Rules" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:322 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:324 msgid "Save the cache locally and reload the cache dump on the next startup" msgstr "" @@ -649,29 +649,29 @@ msgstr "" msgid "Streaming Media" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:236 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:238 msgid "Streaming Media DNS server" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:357 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:359 msgid "Support for local files, such as: file:///var/mosdns/example.txt" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:275 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:277 msgid "TCP/DoT Connection Multiplexing" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:203 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:251 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253 msgid "Tencent Public DNS (119.28.28.28)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:202 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:250 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:204 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252 msgid "Tencent Public DNS (119.29.29.29)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:211 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213 msgid "Tencent Public DNS (DNS over HTTPS)" msgstr "" @@ -679,29 +679,29 @@ msgstr "" msgid "The list of rules only apply to 'Default Config' profiles." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:295 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:297 msgid "" "This feature is typically used when using a self-built DNS server as an " "Remote / Streaming Media DNS upstream (requires support from the upstream " "server)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:425 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:427 msgid "" "This is the content of the file '/etc/mosdns/config_custom.yaml' from which " "your MosDNS configuration will be generated. Only accepts configuration " "content in yaml format." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:206 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208 msgid "TrafficRoute Public DNS (180.184.1.1)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:207 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:209 msgid "TrafficRoute Public DNS (180.184.2.2)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:440 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:442 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:43 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:48 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:67 @@ -754,7 +754,7 @@ msgstr "" msgid "Updating Database..." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:163 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164 msgid "Warning" msgstr "" @@ -765,7 +765,7 @@ msgid "" "domain matching rules)." msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:355 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:357 msgid "" "When using custom rule sources, please use rule types supported by MosDNS " "(domain list or AdGuardHome rules)." @@ -775,13 +775,13 @@ msgstr "" msgid "White Lists" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:254 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:210 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256 msgid "Xinfeng Public DNS (114.114.114.114)" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:209 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:255 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:211 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257 msgid "Xinfeng Public DNS (114.114.115.115)" msgstr "" diff --git a/luci-app-mosdns/po/zh_Hans/mosdns.po b/luci-app-mosdns/po/zh_Hans/mosdns.po index 631b83cd..f222d5a9 100644 --- a/luci-app-mosdns/po/zh_Hans/mosdns.po +++ b/luci-app-mosdns/po/zh_Hans/mosdns.po @@ -11,15 +11,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:217 msgid "360 Public DNS (DNS over HTTPS)" msgstr "360 安全 DNS（DNS over HTTPS）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:354 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:356 msgid "ADblock Source" msgstr "广告过滤规则来源" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:393 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:395 msgid "API Listen port" msgstr "API 监听端口" @@ -67,25 +67,25 @@ msgstr "加入的域名将阻止 PTR 请求（每个域名一行，支持域名 msgid "Advanced Options" msgstr "高级选项" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:204 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:206 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:254 msgid "Aliyun Public DNS (223.5.5.5)" msgstr "阿里云公共 DNS（223.5.5.5）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:207 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:255 msgid "Aliyun Public DNS (223.6.6.6)" msgstr "阿里云公共 DNS（223.6.6.6）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:216 msgid "Aliyun Public DNS (DNS over HTTP/3)" msgstr "阿里云公共 DNS（DNS over HTTP/3）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215 msgid "Aliyun Public DNS (DNS over HTTPS)" msgstr "阿里云公共 DNS（DNS over HTTPS）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:212 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214 msgid "Aliyun Public DNS (DNS over QUIC)" msgstr "阿里云公共 DNS（DNS over QUIC）" @@ -93,11 +93,11 @@ msgstr "阿里云公共 DNS（DNS over QUIC）" msgid "Another update is already in progress." msgstr "另一个更新正在进行中。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:196 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:198 msgid "Apple domains optimization" msgstr "Apple 域名解析优化" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:328 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:330 msgid "Auto Save Cache Interval" msgstr "自动保存缓存间隔（秒）" @@ -107,8 +107,8 @@ msgid "" "rules through scheduled tasks." msgstr "通过定时任务自动更新 GeoIP 和 GeoSite 数据库以及广告过滤规则。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:210 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:212 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:258 msgid "Baidu Public DNS (180.76.76.76)" msgstr "百度公共 DNS（180.76.76.76）" @@ -120,7 +120,7 @@ msgstr "基本选项" msgid "Basic Setting" msgstr "基本设置" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:346 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:348 msgid "" "Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force " "using only A/AAAA records." @@ -136,17 +136,17 @@ msgstr "黑名单" msgid "Block PTR" msgstr "PTR 黑名单" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:248 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:250 msgid "Bootstrap DNS servers" msgstr "Bootstrap DNS 服务器" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:249 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:251 msgid "" "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT " "resolvers you specify as upstreams" msgstr "Bootstrap DNS 服务器用于解析您指定为上游的 DoH / DoT 解析器的 IP 地址" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:321 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:323 msgid "Cache Dump" msgstr "自动保存缓存" @@ -158,21 +158,21 @@ msgstr "检查并更新" msgid "Check And Update GeoData." msgstr "检查并更新 GeoData 数据库。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:182 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:184 msgid "China DNS prefer IPv4" msgstr "国内 DNS 首选 IPv4" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:201 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:203 msgid "China DNS server" msgstr "国内 DNS 服务器" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:227 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:244 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:229 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:246 msgid "Cisco Public DNS (208.67.220.220)" msgstr "思科公共 DNS（208.67.220.220）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:226 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:243 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:228 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:245 msgid "Cisco Public DNS (208.67.222.222)" msgstr "思科公共 DNS（208.67.222.222）" @@ -184,18 +184,18 @@ msgstr "清空日志" msgid "Close" msgstr "关闭" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:221 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:238 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240 msgid "CloudFlare Public DNS (1.0.0.1)" msgstr "CloudFlare 公共 DNS（1.0.0.1）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:220 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:237 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:258 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:222 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:239 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:260 msgid "CloudFlare Public DNS (1.1.1.1)" msgstr "CloudFlare 公共 DNS（1.1.1.1）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:378 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:380 msgid "Cloudflare IP Ranges" msgstr "Cloudflare IP 范围" @@ -207,7 +207,7 @@ msgstr "Cloudflare 选项" msgid "Collecting data..." msgstr "获取数据中..." -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:263 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:265 msgid "Concurrent" msgstr "DNS 服务器并发数（默认 2）" @@ -215,11 +215,11 @@ msgstr "DNS 服务器并发数（默认 2）" msgid "Config File" msgstr "配置文件" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:424 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:426 msgid "Configuration Editor" msgstr "配置编辑器" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:192 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:194 msgid "Custom China DNS" msgstr "自定义国内 DNS" @@ -234,11 +234,11 @@ msgid "" msgstr "" "自定义 Hosts 重写，如：baidu.com 10.0.0.1（每个规则一行，支持域名匹配规则）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:373 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:375 msgid "Custom IP" msgstr "自选 IP" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:231 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:233 msgid "Custom Stream Media DNS" msgstr "自定义流媒体 DNS" @@ -246,21 +246,21 @@ msgstr "自定义流媒体 DNS" msgid "DDNS Lists" msgstr "DDNS 域名" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:310 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:312 msgid "DNS Cache Size" msgstr "DNS 缓存大小" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:173 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:175 msgid "DNS Forward" msgstr "DNS 转发" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:264 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:266 msgid "" "DNS query request concurrency, The number of upstream DNS servers that are " "allowed to initiate requests at the same time" msgstr "DNS 查询请求并发数，允许同时发起请求的上游 DNS 服务器数量" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:179 msgid "DNS redirect" msgstr "DNS 重定向" @@ -268,7 +268,7 @@ msgstr "DNS 重定向" msgid "Database Update" msgstr "数据库更新" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:161 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:162 msgid "Debug" msgstr "调试" @@ -276,22 +276,22 @@ msgstr "调试" msgid "Default Config" msgstr "内置预设" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:345 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:347 msgid "Disable RR Type 65 (HTTPS/SVCB)" msgstr "禁用 RR Type 65 (HTTPS/SVCB)" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:281 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:283 msgid "Disable TLS Certificate" msgstr "禁用 TLS 证书" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:282 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:284 msgid "" "Disable TLS Servers certificate validation, Can be useful if system CA " "certificate expires or the system time is out of order" msgstr "" "禁用 TLS 服务器证书验证，当系统 CA 证书过期或系统时间错乱时，本选项可能会有用" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:270 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:272 msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)" msgstr "DoH/TCP/DoT 连接复用空闲保持时间（默认 30 秒）" @@ -299,41 +299,41 @@ msgstr "DoH/TCP/DoT 连接复用空闲保持时间（默认 30 秒）" msgid "Enable Auto Database Update" msgstr "启用自动更新" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:350 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:352 msgid "Enable DNS ADblock" msgstr "启用 DNS 广告过滤" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:305 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:307 msgid "Enable DNS Cache" msgstr "启用 DNS 缓存" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:288 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:290 msgid "Enable EDNS client subnet" msgstr "启用 EDNS 客户端子网" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:276 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:278 msgid "" "Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode" msgstr "启用 TCP/DoT RFC 7766 新型 Query Pipelining 连接复用模式" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:300 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:302 msgid "Enable this option fallback policy forces forwarding to remote DNS" msgstr "启用此选项 fallback 策略会强制转发到远程 DNS" #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:142 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:366 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:368 msgid "Enabled" msgstr "启用" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:451 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:453 msgid "Enter the GeoIP.dat category to be exported, Allow add multiple tags" msgstr "输入需要导出的 GeoIP.dat 类别条目，允许添加多个标签" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:446 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:448 msgid "Enter the GeoSite.dat category to be exported, Allow add multiple tags" msgstr "填写需要导出的 GeoSite.dat 类别条目，允许添加多个标签" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:165 msgid "Error" msgstr "错误" @@ -369,8 +369,8 @@ msgstr "每周二" msgid "Every Wednesday" msgstr "每周三" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:447 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:452 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:449 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:454 msgid "Export directory: /var/mosdns" msgstr "导出目录：/var/mosdns" @@ -382,7 +382,7 @@ msgstr "清理日志失败：%s" msgid "Failed to start update." msgstr "启动更新失败" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:401 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:403 msgid "Flush DNS Cache" msgstr "刷新 DNS 缓存" @@ -394,27 +394,27 @@ msgstr "刷新 DNS 缓存失败，请检查 MosDNS 状态是否在运行中。" msgid "Flushing DNS Cache Success." msgstr "刷新 DNS 缓存成功" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:399 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:401 msgid "" "Flushing DNS Cache will clear any IP addresses or DNS records from MosDNS " "cache." msgstr "刷新 DNS 缓存会清空 MosDNS 所有 IP 地址和 DNS 解析缓存。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:192 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:194 msgid "Follow WAN interface DNS if not enabled" msgstr "不启用则使用 WAN 接口 DNS" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:197 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:199 msgid "" "For Apple domains equipped with Chinese mainland CDN, always responsive to " "Chinese CDN IP addresses" msgstr "配备中国大陆 CDN 的 Apple 域名，始终应答中国大陆 CDN 地址" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:179 msgid "Force redirect all local DNS queries to MosDNS, a.k.a. DNS Hijacking" msgstr "强制将所有本地 DNS 查询重定向到 MosDNS，即 DNS 劫持。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:173 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:175 msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS" msgstr "将 Dnsmasq 域名解析请求转发到 MosDNS 服务器" @@ -430,7 +430,7 @@ msgstr "全量：包含所有国家和私有 IP 地址。" msgid "GeoData Export" msgstr "GeoData 导出" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:450 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:452 msgid "GeoIP Tags" msgstr "GeoIP 标签" @@ -438,7 +438,7 @@ msgstr "GeoIP 标签" msgid "GeoIP Type" msgstr "GeoIP 类型" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:445 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:447 msgid "GeoSite Tags" msgstr "GeoSite 标签" @@ -450,14 +450,14 @@ msgstr "更新数据库" msgid "GitHub Proxy" msgstr "GitHub 代理" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:225 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:242 msgid "Google Public DNS (8.8.4.4)" msgstr "谷歌公共 DNS（8.8.4.4）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:222 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:239 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:224 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:241 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:259 msgid "Google Public DNS (8.8.8.8)" msgstr "谷歌公共 DNS（8.8.8.8）" @@ -473,11 +473,11 @@ msgstr "灰名单" msgid "Hosts" msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:293 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:295 msgid "IP Address" msgstr "IP 地址" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:379 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:381 msgid "" "IPv4 CIDR: https://www.cloudflare.com/ips-v4
IPv6 CIDR: " msgstr "" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:183 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:185 msgid "" "IPv4 is preferred for China DNS resolution of dual-stack addresses, and is " "not affected when the destination is IPv6 only" msgstr "国内 DNS 解析双栈地址时首选 IPv4，目标仅 IPv6 时不受影响" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:188 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:190 msgid "" "IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack " "addresses, and is not affected when the destination is IPv6 only" msgstr "远程 / 流媒体 DNS 解析双栈地址时首选 IPv4，目标仅 IPv6 时不受影响" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:269 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:271 msgid "Idle Timeout" msgstr "空闲超时" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:162 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:163 msgid "Info" msgstr "信息" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:315 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:317 msgid "Lazy Cache TTL" msgstr "乐观缓存 TTL" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:316 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:318 msgid "" "Lazy cache survival time (in second). To disable Lazy Cache, please set to 0." msgstr "乐观缓存生存时间（单位：秒），要禁用乐观缓存，请设置为 0" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:156 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:157 msgid "Listen Address" msgstr "监听地址" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:151 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:152 msgid "Listen Port" msgstr "监听端口" @@ -534,11 +534,11 @@ msgstr "轻量：仅包含中国大陆和私有 IP 地址。" msgid "Log Data" msgstr "日志数据" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:168 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:169 msgid "Log File" msgstr "日志文件" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:160 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:161 msgid "Log Level" msgstr "日志等级" @@ -546,7 +546,7 @@ msgstr "日志等级" msgid "Logs" msgstr "日志" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:367 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:369 #, fuzzy msgid "" "Match the parsing result with the Cloudflare IP ranges, and when there is a " @@ -556,21 +556,21 @@ msgstr "" "将解析结果与 Cloudflare IP 范围进行匹配，当匹配成功时，使用 “自选 IP” 作为解" "析结果（实验性功能）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:339 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:341 msgid "Maximum TTL" msgstr "覆盖最大 TTL 值（默认 0）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:333 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:335 msgid "Minimum TTL" msgstr "覆盖最小 TTL 值（默认 0）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:340 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:342 msgid "" "Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating " "no modification" msgstr "修改 DNS 应答结果的最大 TTL 值（秒），0 表示不修改" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:334 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:336 msgid "" "Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating " "no modification" @@ -592,7 +592,7 @@ msgstr "MosDNS 是一个插件化的 DNS 转发/分流器。" msgid "NOT RUNNING" msgstr "未运行" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:232 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:234 msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS" msgstr "自定义 Netflix、Disney+、Hulu 以及 “流媒体” 规则列表的 DNS 服务器" @@ -600,7 +600,7 @@ msgstr "自定义 Netflix、Disney+、Hulu 以及 “流媒体” 规则列表 msgid "No log data." msgstr "无日志数据。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:294 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:296 msgid "" "Please provide the IP address you use when accessing foreign websites. This " "IP subnet (0/24) will be used as the ECS address for Remote / Streaming " @@ -613,17 +613,17 @@ msgstr "" msgid "Please wait, this may take a few moments..." msgstr "请稍候，这可能需要一点时间..." -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:299 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:301 msgid "Prevent DNS Leaks" msgstr "防止 DNS 泄漏" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:225 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:242 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:227 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:244 msgid "Quad9 Public DNS (149.112.112.112)" msgstr "Quad9 公共 DNS（149.112.112.112）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:224 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:241 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:226 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:243 msgid "Quad9 Public DNS (9.9.9.9)" msgstr "Quad9 公共 DNS（9.9.9.9）" @@ -647,11 +647,11 @@ msgstr "" msgid "Refresh every %s seconds." msgstr "每 %s 秒刷新。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:187 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:189 msgid "Remote DNS prefer IPv4" msgstr "远程 DNS 首选 IPv4" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:219 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:221 msgid "Remote DNS server" msgstr "远程 DNS 服务器" @@ -663,7 +663,7 @@ msgstr "自定义规则列表" msgid "Rules" msgstr "规则列表" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:322 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:324 msgid "Save the cache locally and reload the cache dump on the next startup" msgstr "保存缓存到本地文件，以供下次启动时重新载入使用" @@ -675,29 +675,29 @@ msgstr "" msgid "Streaming Media" msgstr "流媒体" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:236 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:238 msgid "Streaming Media DNS server" msgstr "流媒体 DNS 服务器" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:357 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:359 msgid "Support for local files, such as: file:///var/mosdns/example.txt" msgstr "支持本地文件，例如：file:///var/mosdns/example.txt" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:275 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:277 msgid "TCP/DoT Connection Multiplexing" msgstr "TCP/DoT 连接复用" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:203 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:251 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253 msgid "Tencent Public DNS (119.28.28.28)" msgstr "腾讯公共 DNS（119.28.28.28）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:202 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:250 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:204 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252 msgid "Tencent Public DNS (119.29.29.29)" msgstr "腾讯公共 DNS（119.29.29.29）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:211 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213 msgid "Tencent Public DNS (DNS over HTTPS)" msgstr "腾讯公共 DNS（DNS over HTTPS）" @@ -705,7 +705,7 @@ msgstr "腾讯公共 DNS（DNS over HTTPS）" msgid "The list of rules only apply to 'Default Config' profiles." msgstr "规则列表仅适用于 “内置预设” 配置文件。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:295 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:297 msgid "" "This feature is typically used when using a self-built DNS server as an " "Remote / Streaming Media DNS upstream (requires support from the upstream " @@ -714,7 +714,7 @@ msgstr "" "此功能通常在使用自建 DNS 服务器作为 远程 / 流媒体 DNS 上游时使用（需要上游服" "务器的支持）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:425 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:427 msgid "" "This is the content of the file '/etc/mosdns/config_custom.yaml' from which " "your MosDNS configuration will be generated. Only accepts configuration " @@ -723,15 +723,15 @@ msgstr "" "这是文件 “/etc/mosdns/config_custom.yaml” 的内容，您的 MosDNS 配置将从此文件" "生成。仅接受 yaml 格式的配置内容。" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:206 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208 msgid "TrafficRoute Public DNS (180.184.1.1)" msgstr "火山引擎公共 DNS（180.184.1.1）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:207 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:209 msgid "TrafficRoute Public DNS (180.184.2.2)" msgstr "火山引擎公共 DNS（180.184.2.2）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:440 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:442 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:43 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:48 #: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:67 @@ -784,7 +784,7 @@ msgstr "更新成功" msgid "Updating Database..." msgstr "更新数据库..." -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:163 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164 msgid "Warning" msgstr "警告" @@ -797,7 +797,7 @@ msgstr "" "启用 “自定义流媒体 DNS” 时，加入的域名始终使用 “流媒体 DNS 服务器” 进行解析" "（每个域名一行，支持域名匹配规则）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:355 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:357 msgid "" "When using custom rule sources, please use rule types supported by MosDNS " "(domain list or AdGuardHome rules)." @@ -809,13 +809,13 @@ msgstr "" msgid "White Lists" msgstr "白名单" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:254 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:210 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256 msgid "Xinfeng Public DNS (114.114.114.114)" msgstr "信风公共 DNS（114.114.114.114）" -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:209 -#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:255 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:211 +#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257 msgid "Xinfeng Public DNS (114.114.115.115)" msgstr "信风公共 DNS（114.114.115.115）" diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc b/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc index fdd48397..3b606693 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc +++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc @@ -193,7 +193,8 @@ function update_geodat() { print(`Downloading ${geoip_url}.sha256sum\n`); stdout.flush(); if (exec_sys(`curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "${tmpdir}/geoip.dat.sha256sum" "${geoip_url}.sha256sum"`).code !== 0) { - exec_sys(`rm -rf "${tmpdir}"`); die("Failed to download geoip.dat.sha256sum"); + exec_sys(`rm -rf "${tmpdir}"`); + die("Failed to download geoip.dat.sha256sum"); } let geoip_sum_remote = split(exec_sys(`cat "${tmpdir}/geoip.dat.sha256sum"`).stdout, /[ \t\n]+/)[0]; @@ -209,12 +210,14 @@ function update_geodat() { print(`Downloading ${geoip_url}\n`); stdout.flush(); if (exec_sys(`curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "${tmpdir}/geoip.dat" "${geoip_url}"`).code !== 0) { - exec_sys(`rm -rf "${tmpdir}"`); die("Failed to download geoip.dat"); + exec_sys(`rm -rf "${tmpdir}"`); + die("Failed to download geoip.dat"); } let sum_downloaded = split(exec_sys(`sha256sum "${tmpdir}/geoip.dat"`).stdout, /[ \t\n]+/)[0]; if (sum_downloaded !== geoip_sum_remote) { - exec_sys(`rm -rf "${tmpdir}"`); die("geoip.dat checksum error"); + exec_sys(`rm -rf "${tmpdir}"`); + die("geoip.dat checksum error"); } geoip_updated = true; } @@ -225,7 +228,8 @@ function update_geodat() { print(`Downloading ${geosite_url}.sha256sum\n`); stdout.flush(); if (exec_sys(`curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "${tmpdir}/geosite.dat.sha256sum" "${geosite_url}.sha256sum"`).code !== 0) { - exec_sys(`rm -rf "${tmpdir}"`); die("Failed to download geosite.dat.sha256sum"); + exec_sys(`rm -rf "${tmpdir}"`); + die("Failed to download geosite.dat.sha256sum"); } let geosite_sum_remote = split(exec_sys(`cat "${tmpdir}/geosite.dat.sha256sum"`).stdout, /[ \t\n]+/)[0]; @@ -241,12 +245,14 @@ function update_geodat() { print(`Downloading ${geosite_url}\n`); stdout.flush(); if (exec_sys(`curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "${tmpdir}/geosite.dat" "${geosite_url}"`).code !== 0) { - exec_sys(`rm -rf "${tmpdir}"`); die("Failed to download geosite.dat"); + exec_sys(`rm -rf "${tmpdir}"`); + die("Failed to download geosite.dat"); } let sum_downloaded = split(exec_sys(`sha256sum "${tmpdir}/geosite.dat"`).stdout, /[ \t\n]+/)[0]; if (sum_downloaded !== geosite_sum_remote) { - exec_sys(`rm -rf "${tmpdir}"`); die("geosite.dat checksum error"); + exec_sys(`rm -rf "${tmpdir}"`); + die("geosite.dat checksum error"); } geosite_updated = true; } diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 6efa6979..47b513a7 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=a322dfb6bfd8987c83453c39582a07771c9deddf9f8f7d2d19c7927ebd5e76c8 endef -GEOSITE_VER:=20260605102713 +GEOSITE_VER:=20260606060258 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=def46411e067e5a504208fe36b48eb849c5cf90540f7c0d2644c634c4553e126 + HASH:=9ce0172ae51884c9e01fa102675e614aafc5ed4607b91d1ed9ecbc3a37ac3db4 endef GEOSITE_IRAN_VER:=202606010205