diff --git a/ddns-go/Makefile b/ddns-go/Makefile
index 65ec8938c..217edf023 100644
--- a/ddns-go/Makefile
+++ b/ddns-go/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-go
-PKG_VERSION:=6.16.13
-PKG_RELEASE:=11
+PKG_VERSION:=6.17.0
+PKG_RELEASE:=12
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)?
diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile
index 8f78bfb74..6365a2dc5 100644
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=5
+PKG_VERSION:=1.7.2
+PKG_RELEASE:=6
 
 LUCI_TITLE:=LuCI Support for mosdns
 LUCI_PKGARCH:=all
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 1c9c0bd09..0425528c7 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
@@ -356,7 +356,7 @@ return view.extend({
 		o.default = false;
 
 		o = s.taboption('advanced', form.DynamicList, 'ad_source', _('ADblock Source'),
-			_('When using custom rule sources, please use rule types supported by MosDNS (domain lists).') +
+			_('When using custom rule sources, please use rule types supported by MosDNS (domain list or AdGuardHome rules).') +
 			'<br>' +
 			_('Support for local files, such as: file:///var/mosdns/example.txt'));
 		o.depends('adblock', '1');
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js
index 5cdb48773..4d5867d72 100644
--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js
@@ -3,25 +3,80 @@
 'require fs';
 'require ui';
 'require view';
+'require rpc';
+
+var callStartUpdate = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'start_update',
+	expect: { '': {} }
+});
+
+var callGetUpdateLog = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'get_update_log',
+	expect: { '': {} }
+});
 
 return view.extend({
 	handleUpdate: function () {
-		ui.showModal(_('Updating...'), [
+		var logTextarea = E('textarea', {
+			'class': 'cbi-input-textarea',
+			'readonly': 'readonly',
+			'style': 'width: 100%; height: 300px; font-family: monospace; font-size: 12px; margin-top: 10px;',
+			'placeholder': _('Starting update...')
+		});
+
+		var closeButton = E('button', {
+			'class': 'btn',
+			'style': 'display: none;',
+			'click': ui.hideModal
+		}, _('Close'));
+
+		ui.showModal(_('Updating Database...'), [
 			E('p', { 'class': 'spinning' }, _('Please wait, this may take a few moments...')),
+			logTextarea,
+			E('div', { 'class': 'right' }, [ closeButton ])
 		]);
-		return fs.exec('/usr/share/mosdns/mosdns.uc', ['update'])
-			.then(function (res) {
-				ui.hideModal();
-				if (res.code === 0) {
-					ui.addNotification(null, E('p', _('Update success')), 'info');
-				} else {
-					ui.addNotification(null, E('p', res.stderr + '<br />' + res.stdout), 'warn');
-					ui.addNotification(null, E('p', _('Update failed, Please check the network status')), 'error');
+
+		var pollLog = function() {
+			return callGetUpdateLog().then(function(res) {
+				if (res && res.log) {
+					logTextarea.value = res.log;
+					logTextarea.scrollTop = logTextarea.scrollHeight;
+
+					if (res.log.match(/UPDATE_FINISHED/)) {
+						ui.hideModal();
+						ui.addNotification(null, E('p', _('Update success')), 'info');
+						return false;
+					}
+
+					if (res.log.match(/Another update is already in progress/)) {
+						ui.hideModal();
+						ui.addNotification(null, E('p', _('Another update is already in progress.')), 'warn');
+						return false;
+					}
 				}
-			}).catch(function (e) {
-				ui.hideModal();
-				ui.addNotification(null, E('p', _('Update failed: %s').format(e.message)), 'error');
+				return true;
 			});
+		};
+
+		return callStartUpdate().then(function(res) {
+			if (res.success) {
+				var interval = window.setInterval(function() {
+					pollLog().then(function(continuePolling) {
+						if (!continuePolling) {
+							window.clearInterval(interval);
+						}
+					});
+				}, 1000);
+			} else {
+				ui.hideModal();
+				ui.addNotification(null, E('p', res.error || _('Failed to start update.')), 'error');
+			}
+		}).catch(function(e) {
+			ui.hideModal();
+			ui.addNotification(null, E('p', _('Update failed: %s').format(e.message)), 'error');
+		});
 	},
 
 	render: function () {
@@ -61,7 +116,7 @@ return view.extend({
 		o.value('geoip', _('Full'));
 		o.value('geoip-only-cn-private', _('Little'));
 		o.rmempty = false;
-		o.default = 'geoip';
+		o.default = 'geoip-only-cn-private';
 
 		o = s.option(form.Value, 'github_proxy', _('GitHub Proxy'),
 			_('Update data files with GitHub Proxy, leave blank to disable proxy downloads.'));
diff --git a/luci-app-mosdns/po/templates/mosdns.pot b/luci-app-mosdns/po/templates/mosdns.pot
index dd4f165c4..80d8a32b6 100644
--- a/luci-app-mosdns/po/templates/mosdns.pot
+++ b/luci-app-mosdns/po/templates/mosdns.pot
@@ -1,471 +1,464 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-20 09:23+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:31
-#: htdocs/luci-static/resources/view/mosdns/basic.js:33
-#: htdocs/luci-static/resources/view/mosdns/basic.js:110
-#: htdocs/luci-static/resources/view/mosdns/logs.js:70
-msgid "MosDNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:31
-msgid "RUNNING"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:33
-msgid "NOT RUNNING"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:95
-msgid "Flushing DNS Cache Success."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:97
-msgid "Flushing DNS Cache Failed, Please check if MosDNS is running."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:111
-msgid "MosDNS is a plugin-based DNS forwarder/traffic splitter."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:133
-msgid "Collecting data..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:139
-msgid "Basic Options"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:140
-msgid "Advanced Options"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:141
-msgid "Cloudflare Options"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:142
-msgid "API Options"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:143
-msgid "GeoData Export"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:146
-#: htdocs/luci-static/resources/view/mosdns/basic.js:370
-msgid "Enabled"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:150
-msgid "Config File"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:151
-msgid "Default Config"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:152
-msgid "Custom Config"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:155
-msgid "Listen Port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:160
-msgid "Listen Address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:164
-msgid "Log Level"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:165
-msgid "Debug"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:166
-msgid "Info"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:167
-msgid "Warning"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:168
-msgid "Error"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:172
-msgid "Log File"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:177
-msgid "DNS Forward"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:177
-msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:181
-msgid "DNS redirect"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:181
-msgid "Force redirect all local DNS queries to MosDNS, a.k.a. DNS Hijacking"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:186
-msgid "China DNS prefer IPv4"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:187
-msgid ""
-"IPv4 is preferred for China DNS resolution of dual-stack addresses, and is "
-"not affected when the destination is IPv6 only"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:191
-msgid "Remote DNS prefer IPv4"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:192
-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 ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:196
-msgid "Custom China DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:196
-msgid "Follow WAN interface DNS if not enabled"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:200
-msgid "Apple domains optimization"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:201
-msgid ""
-"For Apple domains equipped with Chinese mainland CDN, always responsive to "
-"Chinese CDN IP addresses"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:205
-msgid "China DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:206
-#: htdocs/luci-static/resources/view/mosdns/basic.js:254
-msgid "Tencent Public DNS (119.29.29.29)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:207
-#: htdocs/luci-static/resources/view/mosdns/basic.js:255
-msgid "Tencent Public DNS (119.28.28.28)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:208
-#: htdocs/luci-static/resources/view/mosdns/basic.js:256
-msgid "Aliyun Public DNS (223.5.5.5)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:209
-#: htdocs/luci-static/resources/view/mosdns/basic.js:257
-msgid "Aliyun Public DNS (223.6.6.6)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:210
-msgid "TrafficRoute Public DNS (180.184.1.1)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:211
-msgid "TrafficRoute Public DNS (180.184.2.2)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:212
-#: htdocs/luci-static/resources/view/mosdns/basic.js:258
-msgid "Xinfeng Public DNS (114.114.114.114)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:213
-#: htdocs/luci-static/resources/view/mosdns/basic.js:259
-msgid "Xinfeng Public DNS (114.114.115.115)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:214
-#: htdocs/luci-static/resources/view/mosdns/basic.js:260
-msgid "Baidu Public DNS (180.76.76.76)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:215
-msgid "Tencent Public DNS (DNS over HTTPS)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:216
-msgid "Aliyun Public DNS (DNS over QUIC)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:217
-msgid "Aliyun Public DNS (DNS over HTTPS)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:218
-msgid "Aliyun Public DNS (DNS over HTTP/3)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:219
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:219
 msgid "360 Public DNS (DNS over HTTPS)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:223
-msgid "Remote DNS server"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:358
+msgid "ADblock Source"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:224
-#: htdocs/luci-static/resources/view/mosdns/basic.js:241
-#: htdocs/luci-static/resources/view/mosdns/basic.js:262
-msgid "CloudFlare Public DNS (1.1.1.1)"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:399
+msgid "API Listen port"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:225
-#: htdocs/luci-static/resources/view/mosdns/basic.js:242
-msgid "CloudFlare Public DNS (1.0.0.1)"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:142
+msgid "API Options"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:226
-#: htdocs/luci-static/resources/view/mosdns/basic.js:243
-#: htdocs/luci-static/resources/view/mosdns/basic.js:261
-msgid "Google Public DNS (8.8.8.8)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:227
-#: htdocs/luci-static/resources/view/mosdns/basic.js:244
-msgid "Google Public DNS (8.8.4.4)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:228
-#: htdocs/luci-static/resources/view/mosdns/basic.js:245
-msgid "Quad9 Public DNS (9.9.9.9)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:229
-#: htdocs/luci-static/resources/view/mosdns/basic.js:246
-msgid "Quad9 Public DNS (149.112.112.112)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:230
-#: htdocs/luci-static/resources/view/mosdns/basic.js:247
-msgid "Cisco Public DNS (208.67.222.222)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:231
-#: htdocs/luci-static/resources/view/mosdns/basic.js:248
-msgid "Cisco Public DNS (208.67.220.220)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:235
-msgid "Custom Stream Media DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:236
-msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:240
-msgid "Streaming Media DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:252
-msgid "Bootstrap DNS servers"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:253
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:31
 msgid ""
-"Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT "
-"resolvers you specify as upstreams"
+"Added domain names always permit resolution using 'local DNS' with the "
+"highest priority (one domain per line, supports domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:267
-msgid "Concurrent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:268
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:121
 msgid ""
-"DNS query request concurrency, The number of upstream DNS servers that are "
-"allowed to initiate requests at the same time"
+"Added domain names will always use 'Local DNS' for resolution, with a forced "
+"TTL of 5 seconds, and results will not be cached (one domain per line, "
+"supports domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:273
-msgid "Idle Timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:274
-msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:279
-msgid "TCP/DoT Connection Multiplexing"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:280
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:91
 msgid ""
-"Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"
+"Added domain names will always use 'Remote DNS' for resolution (one domain "
+"per line, supports domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:285
-msgid "Disable TLS Certificate"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:286
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:61
 msgid ""
-"Disable TLS Servers certificate validation, Can be useful if system CA "
-"certificate expires or the system time is out of order"
+"Added domain names will block DNS resolution (one domain per line, supports "
+"domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:292
-msgid "Enable EDNS client subnet"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:297
-msgid "IP Address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:298
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:211
 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 "
-"Media DNS requests"
+"Added domain names will block PTR requests (one domain per line, supports "
+"domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:299
-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)"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:140
+msgid "Advanced Options"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:303
-msgid "Prevent DNS Leaks"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256
+msgid "Aliyun Public DNS (223.5.5.5)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:304
-msgid "Enable this option fallback policy forces forwarding to remote DNS"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:209
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257
+msgid "Aliyun Public DNS (223.6.6.6)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:309
-msgid "Enable DNS Cache"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:218
+msgid "Aliyun Public DNS (DNS over HTTP/3)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:314
-msgid "DNS Cache Size"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:217
+msgid "Aliyun Public DNS (DNS over HTTPS)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:319
-msgid "Lazy Cache TTL"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:216
+msgid "Aliyun Public DNS (DNS over QUIC)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:320
-msgid ""
-"Lazy cache survival time (in second). To disable Lazy Cache, please set to 0."
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:55
+msgid "Another update is already in progress."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:325
-msgid "Cache Dump"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:200
+msgid "Apple domains optimization"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:326
-msgid "Save the cache locally and reload the cache dump on the next startup"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:332
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:332
 msgid "Auto Save Cache Interval"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:337
-msgid "Minimum TTL"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:338
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:86
 msgid ""
-"Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating "
-"no modification"
+"Automatically update GeoIP and GeoSite databases as well as ad filtering "
+"rules through scheduled tasks."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:343
-msgid "Maximum TTL"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:260
+msgid "Baidu Public DNS (180.76.76.76)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:344
-msgid ""
-"Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating "
-"no modification"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:139
+msgid "Basic Options"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:349
-msgid "Disable RR Type 65 (HTTPS/SVCB)"
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:14
+msgid "Basic Setting"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:350
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:350
 msgid ""
 "Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force "
 "using only A/AAAA records."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:354
-msgid "Enable DNS ADblock"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:19
+msgid "Block Lists"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:358
-msgid "ADblock Source"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:24
+msgid "Block PTR"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:359
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252
+msgid "Bootstrap DNS servers"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253
 msgid ""
-"When using custom rule sources, please use rule types supported by MosDNS "
-"(domain lists)."
+"Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT "
+"resolvers you specify as upstreams"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:361
-msgid "Support for local files, such as: file:///var/mosdns/example.txt"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:325
+msgid "Cache Dump"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:371
-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)"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:130
+msgid "Check And Update"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:377
-msgid "Custom IP"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:128
+msgid "Check And Update GeoData."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:382
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:186
+msgid "China DNS prefer IPv4"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205
+msgid "China DNS server"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:231
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:248
+msgid "Cisco Public DNS (208.67.220.220)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:230
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:247
+msgid "Cisco Public DNS (208.67.222.222)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:65
+msgid "Clear logs"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:33
+msgid "Close"
+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
+msgid "CloudFlare Public DNS (1.0.0.1)"
+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:262
+msgid "CloudFlare Public DNS (1.1.1.1)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:382
 msgid "Cloudflare IP Ranges"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:383
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:141
+msgid "Cloudflare Options"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:133
+msgid "Collecting data..."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:267
+msgid "Concurrent"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:150
+msgid "Config File"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:430
+msgid "Configuration Editor"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:196
+msgid "Custom China DNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:152
+msgid "Custom Config"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:151
+msgid ""
+"Custom Hosts rewrite, for example: baidu.com 10.0.0.1 (one rule per line, "
+"supports domain matching rules)."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:377
+msgid "Custom IP"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:235
+msgid "Custom Stream Media DNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:21
+msgid "DDNS Lists"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:314
+msgid "DNS Cache Size"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177
+msgid "DNS Forward"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:268
+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:181
+msgid "DNS redirect"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:129
+msgid "Database Update"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:165
+msgid "Debug"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:151
+msgid "Default Config"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:349
+msgid "Disable RR Type 65 (HTTPS/SVCB)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:285
+msgid "Disable TLS Certificate"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:286
+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:274
+msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:91
+msgid "Enable Auto Database Update"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:354
+msgid "Enable DNS ADblock"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:309
+msgid "Enable DNS Cache"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:292
+msgid "Enable EDNS client subnet"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:280
+msgid ""
+"Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:304
+msgid "Enable this option fallback policy forces forwarding to remote DNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:146
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:370
+msgid "Enabled"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:463
+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:458
+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:168
+msgid "Error"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:95
+msgid "Every Day"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:100
+msgid "Every Friday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:96
+msgid "Every Monday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:101
+msgid "Every Saturday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:102
+msgid "Every Sunday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:99
+msgid "Every Thursday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:97
+msgid "Every Tuesday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:98
+msgid "Every Wednesday"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:459
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:464
+msgid "Export directory: /var/mosdns"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:43
+msgid "Failed to clean logs."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:74
+msgid "Failed to start update."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:407
+msgid "Flush DNS Cache"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:97
+msgid "Flushing DNS Cache Failed, Please check if MosDNS is running."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:95
+msgid "Flushing DNS Cache Success."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:405
+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:196
+msgid "Follow WAN interface DNS if not enabled"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:201
+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:181
+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:177
+msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:116
+msgid "Full"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:114
+msgid "Full: includes all Countries and Private IP addresses."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:143
+msgid "GeoData Export"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:462
+msgid "GeoIP Tags"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:111
+msgid "GeoIP Type"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:457
+msgid "GeoSite Tags"
+msgstr ""
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:30
+msgid "Geodata Update"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:121
+msgid "GitHub Proxy"
+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
+msgid "Google Public DNS (8.8.4.4)"
+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:261
+msgid "Google Public DNS (8.8.8.8)"
+msgstr ""
+
+#: luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json:3
+msgid "Grant UCI access for luci-app-mosdns"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:20
+msgid "Grey Lists"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:22
+msgid "Hosts"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:297
+msgid "IP Address"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:383
 msgid ""
 "IPv4 CIDR: <a href=\"https://www.cloudflare.com/ips-v4\" target=\"_blank"
 "\">https://www.cloudflare.com/ips-v4</a> <br /> IPv6 CIDR: <a href=\"https://"
@@ -473,322 +466,321 @@ msgid ""
 "v6</a>"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:402
-msgid "API Listen port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:408
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:187
 msgid ""
-"Flushing DNS Cache will clear any IP addresses or DNS records from MosDNS "
-"cache."
+"IPv4 is preferred for China DNS resolution of dual-stack addresses, and is "
+"not affected when the destination is IPv6 only"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:410
-msgid "Flush DNS Cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:433
-msgid "Configuration Editor"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:434
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:192
 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."
+"IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack "
+"addresses, and is not affected when the destination is IPv6 only"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:455
-#: htdocs/luci-static/resources/view/mosdns/rules.js:53
-#: htdocs/luci-static/resources/view/mosdns/rules.js:59
-#: htdocs/luci-static/resources/view/mosdns/rules.js:83
-#: htdocs/luci-static/resources/view/mosdns/rules.js:89
-#: htdocs/luci-static/resources/view/mosdns/rules.js:113
-#: htdocs/luci-static/resources/view/mosdns/rules.js:119
-#: htdocs/luci-static/resources/view/mosdns/rules.js:143
-#: htdocs/luci-static/resources/view/mosdns/rules.js:149
-#: htdocs/luci-static/resources/view/mosdns/rules.js:173
-#: htdocs/luci-static/resources/view/mosdns/rules.js:179
-#: htdocs/luci-static/resources/view/mosdns/rules.js:203
-#: htdocs/luci-static/resources/view/mosdns/rules.js:209
-#: htdocs/luci-static/resources/view/mosdns/rules.js:233
-#: htdocs/luci-static/resources/view/mosdns/rules.js:239
-#: htdocs/luci-static/resources/view/mosdns/rules.js:263
-#: htdocs/luci-static/resources/view/mosdns/rules.js:269
-#, javascript-format
-msgid "Unable to save contents: %s"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:273
+msgid "Idle Timeout"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:460
-msgid "GeoSite Tags"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:166
+msgid "Info"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:461
-msgid "Enter the GeoSite.dat category to be exported, Allow add multiple tags"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:319
+msgid "Lazy Cache TTL"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:462
-#: htdocs/luci-static/resources/view/mosdns/basic.js:467
-msgid "Export directory: /var/mosdns"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:320
+msgid ""
+"Lazy cache survival time (in second). To disable Lazy Cache, please set to 0."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:465
-msgid "GeoIP Tags"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:160
+msgid "Listen Address"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:466
-msgid "Enter the GeoIP.dat category to be exported, Allow add multiple tags"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:155
+msgid "Listen Port"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/logs.js:27
-msgid "No log data."
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:117
+msgid "Little"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/logs.js:43
-msgid "Failed to clean logs."
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:112
+msgid "Little: only include Mainland China and Private IP addresses."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/logs.js:65
-msgid "Clear logs"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:70
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:70
 msgid "Log Data"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/logs.js:75
-#, javascript-format
-msgid "Refresh every %s seconds."
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:172
+msgid "Log File"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:17
-msgid "Rule Settings"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164
+msgid "Log Level"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:18
-msgid "The list of rules only apply to 'Default Config' profiles."
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:38
+msgid "Logs"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:24
-msgid "White Lists"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:371
+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 ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:25
-msgid "Block Lists"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:343
+msgid "Maximum TTL"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:26
-msgid "Grey Lists"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:337
+msgid "Minimum TTL"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:27
-msgid "DDNS Lists"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:344
+msgid ""
+"Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating "
+"no modification"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:28
-msgid "Hosts"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:338
+msgid ""
+"Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating "
+"no modification"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:29
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:31
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:33
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:110
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:70
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:3
+msgid "MosDNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:111
+msgid "MosDNS is a plugin-based DNS forwarder/traffic splitter."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:33
+msgid "NOT RUNNING"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:236
+msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:27
+msgid "No log data."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:298
+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 "
+"Media DNS requests"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:36
+msgid "Please wait, this may take a few moments..."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:303
+msgid "Prevent DNS Leaks"
+msgstr ""
+
+#: 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 "Quad9 Public DNS (149.112.112.112)"
+msgstr ""
+
+#: 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 "Quad9 Public DNS (9.9.9.9)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:31
+msgid "RUNNING"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:23
 msgid "Redirect"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:30
-msgid "Block PTR"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:31
-msgid "Streaming Media"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:37
-msgid ""
-"Added domain names always permit resolution using 'local DNS' with the "
-"highest priority (one domain per line, supports domain matching rules)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:67
-msgid ""
-"Added domain names will block DNS resolution (one domain per line, supports "
-"domain matching rules)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:97
-msgid ""
-"Added domain names will always use 'Remote DNS' for resolution (one domain "
-"per line, supports domain matching rules)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:127
-msgid ""
-"Added domain names will always use 'Local DNS' for resolution, with a forced "
-"TTL of 5 seconds, and results will not be cached (one domain per line, "
-"supports domain matching rules)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:157
-msgid ""
-"Custom Hosts rewrite, for example: baidu.com 10.0.0.1 (one rule per line, "
-"supports domain matching rules)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:187
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:181
 msgid ""
 "Redirecting requests for domain names. Request domain A, but return records "
 "for domain B, for example: baidu.com qq.com (one rule per line)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:217
-msgid ""
-"Added domain names will block PTR requests (one domain per line, supports "
-"domain matching rules)."
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:75
+msgid "Refresh every %s seconds."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:247
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:191
+msgid "Remote DNS prefer IPv4"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223
+msgid "Remote DNS server"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:11
+msgid "Rule Settings"
+msgstr ""
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:22
+msgid "Rules"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:326
+msgid "Save the cache locally and reload the cache dump on the next startup"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:26
+msgid "Starting update..."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:25
+msgid "Streaming Media"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240
+msgid "Streaming Media DNS server"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:361
+msgid "Support for local files, such as: file:///var/mosdns/example.txt"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:279
+msgid "TCP/DoT Connection Multiplexing"
+msgstr ""
+
+#: 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 "Tencent Public DNS (119.28.28.28)"
+msgstr ""
+
+#: 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 "Tencent Public DNS (119.29.29.29)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215
+msgid "Tencent Public DNS (DNS over HTTPS)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:12
+msgid "The list of rules only apply to 'Default Config' profiles."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:299
+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:431
+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:210
+msgid "TrafficRoute Public DNS (180.184.1.1)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:211
+msgid "TrafficRoute Public DNS (180.184.2.2)"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:452
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:47
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:53
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:77
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:83
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:107
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:113
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:137
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:143
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:167
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:173
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:197
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:203
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:227
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:233
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:257
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:263
+msgid "Unable to save contents: %s"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:94
+msgid "Update Cycle"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:85
+msgid "Update GeoIP & GeoSite databases"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:105
+msgid "Update Time"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:122
+msgid ""
+"Update data files with GitHub Proxy, leave blank to disable proxy downloads."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:78
+msgid "Update failed: %s"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:49
+msgid "Update success"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:35
+msgid "Updating Database..."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:167
+msgid "Warning"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:241
 msgid ""
 "When enabling 'Custom Stream Media DNS', added domains will always use the "
 "'Streaming Media DNS server' for resolution (one domain per line, supports "
 "domain matching rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:284
-#: htdocs/luci-static/resources/view/mosdns/rules.js:288
-#, javascript-format
-msgid "Failed to restart mosdns: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:9
-msgid "Updating..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:10
-msgid "Please wait, this may take a few moments..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:16
-msgid "Update success"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:19
-msgid "Update failed, Please check the network status"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:23
-#, javascript-format
-msgid "Update failed: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:30
-msgid "Update GeoIP & GeoSite databases"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:31
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:359
 msgid ""
-"Automatically update GeoIP and GeoSite databases as well as ad filtering "
-"rules through scheduled tasks."
+"When using custom rule sources, please use rule types supported by MosDNS "
+"(domain list or AdGuardHome rules)."
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:36
-msgid "Enable Auto Database Update"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:18
+msgid "White Lists"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:39
-msgid "Update Cycle"
+#: 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 "Xinfeng Public DNS (114.114.114.114)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:40
-msgid "Every Day"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:259
+msgid "Xinfeng Public DNS (114.114.115.115)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:41
-msgid "Every Monday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:42
-msgid "Every Tuesday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:43
-msgid "Every Wednesday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:44
-msgid "Every Thursday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:45
-msgid "Every Friday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:46
-msgid "Every Saturday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:47
-msgid "Every Sunday"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:50
-msgid "Update Time"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:56
-msgid "GeoIP Type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:57
-msgid "Little: only include Mainland China and Private IP addresses."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:59
-msgid "Full: includes all Countries and Private IP addresses."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:61
-msgid "Full"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:62
-msgid "Little"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:66
-msgid "GitHub Proxy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:67
-msgid ""
-"Update data files with GitHub Proxy, leave blank to disable proxy downloads."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:68
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:123
 msgid "https://gh-proxy.com"
 msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:73
-msgid "Check And Update GeoData."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:74
-msgid "Database Update"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:75
-msgid "Check And Update"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:14
-msgid "Basic Setting"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:22
-msgid "Rules"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:30
-msgid "Geodata Update"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:38
-msgid "Logs"
-msgstr ""
diff --git a/luci-app-mosdns/po/zh_Hans/mosdns.po b/luci-app-mosdns/po/zh_Hans/mosdns.po
index 00d434c9b..742b8c305 100644
--- a/luci-app-mosdns/po/zh_Hans/mosdns.po
+++ b/luci-app-mosdns/po/zh_Hans/mosdns.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-03-20 09:23+0800\n"
-"PO-Revision-Date: 2026-03-19 20:33+0800\n"
+"PO-Revision-Date: 2026-05-01 09:13+0800\n"
 "Last-Translator: sbwml <admin@cooluc.com>\n"
 "Language-Team: Chinese\n"
 "Language: zh_Hans\n"
@@ -11,605 +11,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:31
-#: htdocs/luci-static/resources/view/mosdns/basic.js:33
-#: htdocs/luci-static/resources/view/mosdns/basic.js:110
-#: htdocs/luci-static/resources/view/mosdns/logs.js:70
-msgid "MosDNS"
-msgstr "MosDNS"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:31
-msgid "RUNNING"
-msgstr "运行中"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:33
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:95
-msgid "Flushing DNS Cache Success."
-msgstr "刷新 DNS 缓存成功"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:97
-msgid "Flushing DNS Cache Failed, Please check if MosDNS is running."
-msgstr "刷新 DNS 缓存失败，请检查 MosDNS 状态是否在运行中。"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:111
-msgid "MosDNS is a plugin-based DNS forwarder/traffic splitter."
-msgstr "MosDNS 是一个插件化的 DNS 转发/分流器。"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:133
-msgid "Collecting data..."
-msgstr "获取数据中..."
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:139
-msgid "Basic Options"
-msgstr "基本选项"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:140
-msgid "Advanced Options"
-msgstr "高级选项"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:141
-msgid "Cloudflare Options"
-msgstr "Cloudflare 选项"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:142
-msgid "API Options"
-msgstr "API 选项"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:143
-msgid "GeoData Export"
-msgstr "GeoData 导出"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:146
-#: htdocs/luci-static/resources/view/mosdns/basic.js:370
-msgid "Enabled"
-msgstr "启用"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:150
-msgid "Config File"
-msgstr "配置文件"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:151
-msgid "Default Config"
-msgstr "内置预设"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:152
-msgid "Custom Config"
-msgstr "自定义"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:155
-msgid "Listen Port"
-msgstr "监听端口"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:160
-msgid "Listen Address"
-msgstr "监听地址"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:164
-msgid "Log Level"
-msgstr "日志等级"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:165
-msgid "Debug"
-msgstr "调试"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:166
-msgid "Info"
-msgstr "信息"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:167
-msgid "Warning"
-msgstr "警告"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:168
-msgid "Error"
-msgstr "错误"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:172
-msgid "Log File"
-msgstr "日志文件"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:177
-msgid "DNS Forward"
-msgstr "DNS 转发"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:177
-msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
-msgstr "将 Dnsmasq 域名解析请求转发到 MosDNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:181
-msgid "DNS redirect"
-msgstr "DNS 重定向"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:181
-msgid "Force redirect all local DNS queries to MosDNS, a.k.a. DNS Hijacking"
-msgstr "强制将所有本地 DNS 查询重定向到 MosDNS，即 DNS 劫持。"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:186
-msgid "China DNS prefer IPv4"
-msgstr "国内 DNS 首选 IPv4"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:187
-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 时不受影响"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:191
-msgid "Remote DNS prefer IPv4"
-msgstr "远程 DNS 首选 IPv4"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:192
-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 时不受影响"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:196
-msgid "Custom China DNS"
-msgstr "自定义国内 DNS"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:196
-msgid "Follow WAN interface DNS if not enabled"
-msgstr "不启用则使用 WAN 接口 DNS"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:200
-msgid "Apple domains optimization"
-msgstr "Apple 域名解析优化"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:201
-msgid ""
-"For Apple domains equipped with Chinese mainland CDN, always responsive to "
-"Chinese CDN IP addresses"
-msgstr "配备中国大陆 CDN 的 Apple 域名，始终应答中国大陆 CDN 地址"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:205
-msgid "China DNS server"
-msgstr "国内 DNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:206
-#: htdocs/luci-static/resources/view/mosdns/basic.js:254
-msgid "Tencent Public DNS (119.29.29.29)"
-msgstr "腾讯公共 DNS（119.29.29.29）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:207
-#: htdocs/luci-static/resources/view/mosdns/basic.js:255
-msgid "Tencent Public DNS (119.28.28.28)"
-msgstr "腾讯公共 DNS（119.28.28.28）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:208
-#: htdocs/luci-static/resources/view/mosdns/basic.js:256
-msgid "Aliyun Public DNS (223.5.5.5)"
-msgstr "阿里云公共 DNS（223.5.5.5）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:209
-#: htdocs/luci-static/resources/view/mosdns/basic.js:257
-msgid "Aliyun Public DNS (223.6.6.6)"
-msgstr "阿里云公共 DNS（223.6.6.6）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:210
-msgid "TrafficRoute Public DNS (180.184.1.1)"
-msgstr "火山引擎公共 DNS（180.184.1.1）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:211
-msgid "TrafficRoute Public DNS (180.184.2.2)"
-msgstr "火山引擎公共 DNS（180.184.2.2）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:212
-#: htdocs/luci-static/resources/view/mosdns/basic.js:258
-msgid "Xinfeng Public DNS (114.114.114.114)"
-msgstr "信风公共 DNS（114.114.114.114）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:213
-#: htdocs/luci-static/resources/view/mosdns/basic.js:259
-msgid "Xinfeng Public DNS (114.114.115.115)"
-msgstr "信风公共 DNS（114.114.115.115）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:214
-#: htdocs/luci-static/resources/view/mosdns/basic.js:260
-msgid "Baidu Public DNS (180.76.76.76)"
-msgstr "百度公共 DNS（180.76.76.76）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:215
-msgid "Tencent Public DNS (DNS over HTTPS)"
-msgstr "腾讯公共 DNS（DNS over HTTPS）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:216
-msgid "Aliyun Public DNS (DNS over QUIC)"
-msgstr "阿里云公共 DNS（DNS over QUIC）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:217
-msgid "Aliyun Public DNS (DNS over HTTPS)"
-msgstr "阿里云公共 DNS（DNS over HTTPS）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:218
-msgid "Aliyun Public DNS (DNS over HTTP/3)"
-msgstr "阿里云公共 DNS（DNS over HTTP/3）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:219
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:219
 msgid "360 Public DNS (DNS over HTTPS)"
 msgstr "360 安全 DNS（DNS over HTTPS）"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:223
-msgid "Remote DNS server"
-msgstr "远程 DNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:224
-#: htdocs/luci-static/resources/view/mosdns/basic.js:241
-#: htdocs/luci-static/resources/view/mosdns/basic.js:262
-msgid "CloudFlare Public DNS (1.1.1.1)"
-msgstr "CloudFlare 公共 DNS（1.1.1.1）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:225
-#: htdocs/luci-static/resources/view/mosdns/basic.js:242
-msgid "CloudFlare Public DNS (1.0.0.1)"
-msgstr "CloudFlare 公共 DNS（1.0.0.1）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:226
-#: htdocs/luci-static/resources/view/mosdns/basic.js:243
-#: htdocs/luci-static/resources/view/mosdns/basic.js:261
-msgid "Google Public DNS (8.8.8.8)"
-msgstr "谷歌公共 DNS（8.8.8.8）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:227
-#: htdocs/luci-static/resources/view/mosdns/basic.js:244
-msgid "Google Public DNS (8.8.4.4)"
-msgstr "谷歌公共 DNS（8.8.4.4）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:228
-#: htdocs/luci-static/resources/view/mosdns/basic.js:245
-msgid "Quad9 Public DNS (9.9.9.9)"
-msgstr "Quad9 公共 DNS（9.9.9.9）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:229
-#: htdocs/luci-static/resources/view/mosdns/basic.js:246
-msgid "Quad9 Public DNS (149.112.112.112)"
-msgstr "Quad9 公共 DNS（149.112.112.112）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:230
-#: htdocs/luci-static/resources/view/mosdns/basic.js:247
-msgid "Cisco Public DNS (208.67.222.222)"
-msgstr "思科公共 DNS（208.67.222.222）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:231
-#: htdocs/luci-static/resources/view/mosdns/basic.js:248
-msgid "Cisco Public DNS (208.67.220.220)"
-msgstr "思科公共 DNS（208.67.220.220）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:235
-msgid "Custom Stream Media DNS"
-msgstr "自定义流媒体 DNS"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:236
-msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
-msgstr "自定义 Netflix、Disney+、Hulu 以及 “流媒体” 规则列表的 DNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:240
-msgid "Streaming Media DNS server"
-msgstr "流媒体 DNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:252
-msgid "Bootstrap DNS servers"
-msgstr "Bootstrap DNS 服务器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:253
-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 地址"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:267
-msgid "Concurrent"
-msgstr "DNS 服务器并发数（默认 2）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:268
-msgid ""
-"DNS query request concurrency, The number of upstream DNS servers that are "
-"allowed to initiate requests at the same time"
-msgstr "DNS 查询请求并发数，允许同时发起请求的上游 DNS 服务器数量"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:273
-msgid "Idle Timeout"
-msgstr "空闲超时"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:274
-msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)"
-msgstr "DoH/TCP/DoT 连接复用空闲保持时间（默认 30 秒）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:279
-msgid "TCP/DoT Connection Multiplexing"
-msgstr "TCP/DoT 连接复用"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:280
-msgid ""
-"Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"
-msgstr "启用 TCP/DoT RFC 7766 新型 Query Pipelining 连接复用模式"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:285
-msgid "Disable TLS Certificate"
-msgstr "禁用 TLS 证书"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:286
-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 证书过期或系统时间错乱时，本选项可能会有用"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:292
-msgid "Enable EDNS client subnet"
-msgstr "启用 EDNS 客户端子网"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:297
-msgid "IP Address"
-msgstr "IP 地址"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:298
-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 "
-"Media DNS requests"
-msgstr ""
-"请提供您在访问国外网站时使用的 IP 地址，这个 IP 子网（0/24）将用作 远程 / 流"
-"媒体 DNS 请求的 ECS 地址"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:299
-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 ""
-"此功能通常在使用自建 DNS 服务器作为 远程 / 流媒体 DNS 上游时使用（需要上游服"
-"务器的支持）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:303
-msgid "Prevent DNS Leaks"
-msgstr "防止 DNS 泄漏"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:304
-msgid "Enable this option fallback policy forces forwarding to remote DNS"
-msgstr "启用此选项 fallback 策略会强制转发到远程 DNS"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:309
-msgid "Enable DNS Cache"
-msgstr "启用 DNS 缓存"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:314
-msgid "DNS Cache Size"
-msgstr "DNS 缓存大小"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:319
-msgid "Lazy Cache TTL"
-msgstr "乐观缓存 TTL"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:320
-msgid ""
-"Lazy cache survival time (in second). To disable Lazy Cache, please set to 0."
-msgstr "乐观缓存生存时间（单位：秒），要禁用乐观缓存，请设置为 0"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:325
-msgid "Cache Dump"
-msgstr "自动保存缓存"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:326
-msgid "Save the cache locally and reload the cache dump on the next startup"
-msgstr "保存缓存到本地文件，以供下次启动时重新载入使用"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:332
-msgid "Auto Save Cache Interval"
-msgstr "自动保存缓存间隔（秒）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:337
-msgid "Minimum TTL"
-msgstr "覆盖最小 TTL 值（默认 0）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:338
-msgid ""
-"Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating "
-"no modification"
-msgstr "修改 DNS 应答结果的最小 TTL 值 (秒)，0 表示不修改"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:343
-msgid "Maximum TTL"
-msgstr "覆盖最大 TTL 值（默认 0）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:344
-msgid ""
-"Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating "
-"no modification"
-msgstr "修改 DNS 应答结果的最大 TTL 值（秒），0 表示不修改"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:349
-msgid "Disable RR Type 65 (HTTPS/SVCB)"
-msgstr "禁用 RR Type 65 (HTTPS/SVCB)"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:350
-msgid ""
-"Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force "
-"using only A/AAAA records."
-msgstr ""
-"屏蔽 DNS 类型 65 记录（HTTPS/SVCB，用于 HTTP/3、ECH 等），强制仅使用 A/AAAA "
-"解析。"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:354
-msgid "Enable DNS ADblock"
-msgstr "启用 DNS 广告过滤"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:358
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:358
 msgid "ADblock Source"
 msgstr "广告过滤规则来源"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:359
-msgid ""
-"When using custom rule sources, please use rule types supported by MosDNS "
-"(domain lists)."
-msgstr "使用自定义规则来源时，请使用 MosDNS 支持的规则类型（域名列表）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:361
-msgid "Support for local files, such as: file:///var/mosdns/example.txt"
-msgstr "支持本地文件，例如：file:///var/mosdns/example.txt"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:371
-#, fuzzy
-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 ""
-"将解析结果与 Cloudflare IP 范围进行匹配，当匹配成功时，使用 “自选 IP” 作为解"
-"析结果（实验性功能）"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:377
-msgid "Custom IP"
-msgstr "自选 IP"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:382
-msgid "Cloudflare IP Ranges"
-msgstr "Cloudflare IP 范围"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:383
-msgid ""
-"IPv4 CIDR: <a href=\"https://www.cloudflare.com/ips-v4\" target=\"_blank"
-"\">https://www.cloudflare.com/ips-v4</a> <br /> IPv6 CIDR: <a href=\"https://"
-"www.cloudflare.com/ips-v6\" target=\"_blank\">https://www.cloudflare.com/ips-"
-"v6</a>"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:402
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:399
 msgid "API Listen port"
 msgstr "API 监听端口"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:408
-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:142
+msgid "API Options"
+msgstr "API 选项"
 
-#: htdocs/luci-static/resources/view/mosdns/basic.js:410
-msgid "Flush DNS Cache"
-msgstr "刷新 DNS 缓存"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:433
-msgid "Configuration Editor"
-msgstr "配置编辑器"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:434
-#, fuzzy
-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 ""
-"这是文件 “/etc/mosdns/config_custom.yaml” 的内容，您的 MosDNS 配置将从此文件"
-"生成。仅接受 yaml 格式的配置内容。"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:455
-#: htdocs/luci-static/resources/view/mosdns/rules.js:53
-#: htdocs/luci-static/resources/view/mosdns/rules.js:59
-#: htdocs/luci-static/resources/view/mosdns/rules.js:83
-#: htdocs/luci-static/resources/view/mosdns/rules.js:89
-#: htdocs/luci-static/resources/view/mosdns/rules.js:113
-#: htdocs/luci-static/resources/view/mosdns/rules.js:119
-#: htdocs/luci-static/resources/view/mosdns/rules.js:143
-#: htdocs/luci-static/resources/view/mosdns/rules.js:149
-#: htdocs/luci-static/resources/view/mosdns/rules.js:173
-#: htdocs/luci-static/resources/view/mosdns/rules.js:179
-#: htdocs/luci-static/resources/view/mosdns/rules.js:203
-#: htdocs/luci-static/resources/view/mosdns/rules.js:209
-#: htdocs/luci-static/resources/view/mosdns/rules.js:233
-#: htdocs/luci-static/resources/view/mosdns/rules.js:239
-#: htdocs/luci-static/resources/view/mosdns/rules.js:263
-#: htdocs/luci-static/resources/view/mosdns/rules.js:269
-#, javascript-format
-msgid "Unable to save contents: %s"
-msgstr "无法保存内容：%s"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:460
-msgid "GeoSite Tags"
-msgstr "GeoSite 标签"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:461
-msgid "Enter the GeoSite.dat category to be exported, Allow add multiple tags"
-msgstr "填写需要导出的 GeoSite.dat 类别条目，允许添加多个标签"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:462
-#: htdocs/luci-static/resources/view/mosdns/basic.js:467
-msgid "Export directory: /var/mosdns"
-msgstr "导出目录：/var/mosdns"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:465
-msgid "GeoIP Tags"
-msgstr "GeoIP 标签"
-
-#: htdocs/luci-static/resources/view/mosdns/basic.js:466
-msgid "Enter the GeoIP.dat category to be exported, Allow add multiple tags"
-msgstr "输入需要导出的 GeoIP.dat 类别条目，允许添加多个标签"
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:27
-msgid "No log data."
-msgstr "无日志数据。"
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:43
-#, fuzzy
-msgid "Failed to clean logs."
-msgstr "无法重启 MosDNS：%s"
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:65
-msgid "Clear logs"
-msgstr "清空日志"
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:70
-msgid "Log Data"
-msgstr "日志数据"
-
-#: htdocs/luci-static/resources/view/mosdns/logs.js:75
-#, javascript-format
-msgid "Refresh every %s seconds."
-msgstr "每 %s 秒刷新。"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:17
-msgid "Rule Settings"
-msgstr "自定义规则列表"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:18
-msgid "The list of rules only apply to 'Default Config' profiles."
-msgstr "规则列表仅适用于 “内置预设” 配置文件。"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:24
-msgid "White Lists"
-msgstr "白名单"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:25
-msgid "Block Lists"
-msgstr "黑名单"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:26
-msgid "Grey Lists"
-msgstr "灰名单"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:27
-msgid "DDNS Lists"
-msgstr "DDNS 域名"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:28
-msgid "Hosts"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:29
-msgid "Redirect"
-msgstr "重定向"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:30
-msgid "Block PTR"
-msgstr "PTR 黑名单"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:31
-msgid "Streaming Media"
-msgstr "流媒体"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:37
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:31
 msgid ""
 "Added domain names always permit resolution using 'local DNS' with the "
 "highest priority (one domain per line, supports domain matching rules)."
@@ -617,20 +35,7 @@ msgstr ""
 "加入的域名始终允许使用 “本地 DNS” 进行解析，且优先级最高（每个域名一行，支持"
 "域名匹配规则）"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:67
-msgid ""
-"Added domain names will block DNS resolution (one domain per line, supports "
-"domain matching rules)."
-msgstr "加入的域名将屏蔽 DNS 解析（每个域名一行，支持域名匹配规则）"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:97
-msgid ""
-"Added domain names will always use 'Remote DNS' for resolution (one domain "
-"per line, supports domain matching rules)."
-msgstr ""
-"加入的域名始终使用 “远程 DNS” 进行解析（每个域名一行，支持域名匹配规则）"
-
-#: htdocs/luci-static/resources/view/mosdns/rules.js:127
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:121
 msgid ""
 "Added domain names will always use 'Local DNS' for resolution, with a forced "
 "TTL of 5 seconds, and results will not be cached (one domain per line, "
@@ -639,14 +44,598 @@ msgstr ""
 "加入的域名始终使用 “本地 DNS” 进行解析，并且强制 TTL 5 秒，解析结果不会进入缓"
 "存（每个域名一行，支持域名匹配规则）"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:157
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:91
+msgid ""
+"Added domain names will always use 'Remote DNS' for resolution (one domain "
+"per line, supports domain matching rules)."
+msgstr ""
+"加入的域名始终使用 “远程 DNS” 进行解析（每个域名一行，支持域名匹配规则）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:61
+msgid ""
+"Added domain names will block DNS resolution (one domain per line, supports "
+"domain matching rules)."
+msgstr "加入的域名将屏蔽 DNS 解析（每个域名一行，支持域名匹配规则）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:211
+msgid ""
+"Added domain names will block PTR requests (one domain per line, supports "
+"domain matching rules)."
+msgstr "加入的域名将阻止 PTR 请求（每个域名一行，支持域名匹配规则）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:140
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:208
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:256
+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:209
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:257
+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:218
+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:217
+msgid "Aliyun Public DNS (DNS over HTTPS)"
+msgstr "阿里云公共 DNS（DNS over HTTPS）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:216
+msgid "Aliyun Public DNS (DNS over QUIC)"
+msgstr "阿里云公共 DNS（DNS over QUIC）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:55
+msgid "Another update is already in progress."
+msgstr "另一个更新正在进行中。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:200
+msgid "Apple domains optimization"
+msgstr "Apple 域名解析优化"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:332
+msgid "Auto Save Cache Interval"
+msgstr "自动保存缓存间隔（秒）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:86
+msgid ""
+"Automatically update GeoIP and GeoSite databases as well as ad filtering "
+"rules through scheduled tasks."
+msgstr "通过定时任务自动更新 GeoIP 和 GeoSite 数据库以及广告过滤规则。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:214
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:260
+msgid "Baidu Public DNS (180.76.76.76)"
+msgstr "百度公共 DNS（180.76.76.76）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:139
+msgid "Basic Options"
+msgstr "基本选项"
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:14
+msgid "Basic Setting"
+msgstr "基本设置"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:350
+msgid ""
+"Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force "
+"using only A/AAAA records."
+msgstr ""
+"屏蔽 DNS 类型 65 记录（HTTPS/SVCB，用于 HTTP/3、ECH 等），强制仅使用 A/AAAA "
+"解析。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:19
+msgid "Block Lists"
+msgstr "黑名单"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:24
+msgid "Block PTR"
+msgstr "PTR 黑名单"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:252
+msgid "Bootstrap DNS servers"
+msgstr "Bootstrap DNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:253
+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:325
+msgid "Cache Dump"
+msgstr "自动保存缓存"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:130
+msgid "Check And Update"
+msgstr "检查并更新"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:128
+msgid "Check And Update GeoData."
+msgstr "检查并更新 GeoData 数据库。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:186
+msgid "China DNS prefer IPv4"
+msgstr "国内 DNS 首选 IPv4"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:205
+msgid "China DNS server"
+msgstr "国内 DNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:231
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:248
+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:230
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:247
+msgid "Cisco Public DNS (208.67.222.222)"
+msgstr "思科公共 DNS（208.67.222.222）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:65
+msgid "Clear logs"
+msgstr "清空日志"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:33
+msgid "Close"
+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
+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:224
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:241
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:262
+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:382
+msgid "Cloudflare IP Ranges"
+msgstr "Cloudflare IP 范围"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:141
+msgid "Cloudflare Options"
+msgstr "Cloudflare 选项"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:133
+msgid "Collecting data..."
+msgstr "获取数据中..."
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:267
+msgid "Concurrent"
+msgstr "DNS 服务器并发数（默认 2）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:150
+msgid "Config File"
+msgstr "配置文件"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:430
+msgid "Configuration Editor"
+msgstr "配置编辑器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:196
+msgid "Custom China DNS"
+msgstr "自定义国内 DNS"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:152
+msgid "Custom Config"
+msgstr "自定义"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:151
 msgid ""
 "Custom Hosts rewrite, for example: baidu.com 10.0.0.1 (one rule per line, "
 "supports domain matching rules)."
 msgstr ""
 "自定义 Hosts 重写，如：baidu.com 10.0.0.1（每个规则一行，支持域名匹配规则）"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:187
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:377
+msgid "Custom IP"
+msgstr "自选 IP"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:235
+msgid "Custom Stream Media DNS"
+msgstr "自定义流媒体 DNS"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:21
+msgid "DDNS Lists"
+msgstr "DDNS 域名"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:314
+msgid "DNS Cache Size"
+msgstr "DNS 缓存大小"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:177
+msgid "DNS Forward"
+msgstr "DNS 转发"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:268
+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:181
+msgid "DNS redirect"
+msgstr "DNS 重定向"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:129
+msgid "Database Update"
+msgstr "数据库更新"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:165
+msgid "Debug"
+msgstr "调试"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:151
+msgid "Default Config"
+msgstr "内置预设"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:349
+msgid "Disable RR Type 65 (HTTPS/SVCB)"
+msgstr "禁用 RR Type 65 (HTTPS/SVCB)"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:285
+msgid "Disable TLS Certificate"
+msgstr "禁用 TLS 证书"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:286
+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:274
+msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)"
+msgstr "DoH/TCP/DoT 连接复用空闲保持时间（默认 30 秒）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:91
+msgid "Enable Auto Database Update"
+msgstr "启用自动更新"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:354
+msgid "Enable DNS ADblock"
+msgstr "启用 DNS 广告过滤"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:309
+msgid "Enable DNS Cache"
+msgstr "启用 DNS 缓存"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:292
+msgid "Enable EDNS client subnet"
+msgstr "启用 EDNS 客户端子网"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:280
+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:304
+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:146
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:370
+msgid "Enabled"
+msgstr "启用"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:463
+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:458
+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:168
+msgid "Error"
+msgstr "错误"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:95
+msgid "Every Day"
+msgstr "每天"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:100
+msgid "Every Friday"
+msgstr "每周五"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:96
+msgid "Every Monday"
+msgstr "每周一"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:101
+msgid "Every Saturday"
+msgstr "每周六"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:102
+msgid "Every Sunday"
+msgstr "每周日"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:99
+msgid "Every Thursday"
+msgstr "每周四"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:97
+msgid "Every Tuesday"
+msgstr "每周二"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:98
+msgid "Every Wednesday"
+msgstr "每周三"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:459
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:464
+msgid "Export directory: /var/mosdns"
+msgstr "导出目录：/var/mosdns"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:43
+msgid "Failed to clean logs."
+msgstr "清理日志失败：%s"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:74
+msgid "Failed to start update."
+msgstr "启动更新失败"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:407
+msgid "Flush DNS Cache"
+msgstr "刷新 DNS 缓存"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:97
+msgid "Flushing DNS Cache Failed, Please check if MosDNS is running."
+msgstr "刷新 DNS 缓存失败，请检查 MosDNS 状态是否在运行中。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:95
+msgid "Flushing DNS Cache Success."
+msgstr "刷新 DNS 缓存成功"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:405
+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:196
+msgid "Follow WAN interface DNS if not enabled"
+msgstr "不启用则使用 WAN 接口 DNS"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:201
+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:181
+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:177
+msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
+msgstr "将 Dnsmasq 域名解析请求转发到 MosDNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:116
+msgid "Full"
+msgstr "全量"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:114
+msgid "Full: includes all Countries and Private IP addresses."
+msgstr "全量：包含所有国家和私有 IP 地址。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:143
+msgid "GeoData Export"
+msgstr "GeoData 导出"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:462
+msgid "GeoIP Tags"
+msgstr "GeoIP 标签"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:111
+msgid "GeoIP Type"
+msgstr "GeoIP 类型"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:457
+msgid "GeoSite Tags"
+msgstr "GeoSite 标签"
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:30
+msgid "Geodata Update"
+msgstr "更新数据库"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:121
+msgid "GitHub Proxy"
+msgstr "GitHub 代理"
+
+#: 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 "Google Public DNS (8.8.4.4)"
+msgstr "谷歌公共 DNS（8.8.4.4）"
+
+#: 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:261
+msgid "Google Public DNS (8.8.8.8)"
+msgstr "谷歌公共 DNS（8.8.8.8）"
+
+#: luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json:3
+msgid "Grant UCI access for luci-app-mosdns"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:20
+msgid "Grey Lists"
+msgstr "灰名单"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:22
+msgid "Hosts"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:297
+msgid "IP Address"
+msgstr "IP 地址"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:383
+msgid ""
+"IPv4 CIDR: <a href=\"https://www.cloudflare.com/ips-v4\" target=\"_blank"
+"\">https://www.cloudflare.com/ips-v4</a> <br /> IPv6 CIDR: <a href=\"https://"
+"www.cloudflare.com/ips-v6\" target=\"_blank\">https://www.cloudflare.com/ips-"
+"v6</a>"
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:187
+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:192
+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:273
+msgid "Idle Timeout"
+msgstr "空闲超时"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:166
+msgid "Info"
+msgstr "信息"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:319
+msgid "Lazy Cache TTL"
+msgstr "乐观缓存 TTL"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:320
+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:160
+msgid "Listen Address"
+msgstr "监听地址"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:155
+msgid "Listen Port"
+msgstr "监听端口"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:117
+msgid "Little"
+msgstr "轻量"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:112
+msgid "Little: only include Mainland China and Private IP addresses."
+msgstr "轻量：仅包含中国大陆和私有 IP 地址。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:70
+msgid "Log Data"
+msgstr "日志数据"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:172
+msgid "Log File"
+msgstr "日志文件"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:164
+msgid "Log Level"
+msgstr "日志等级"
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:38
+msgid "Logs"
+msgstr "日志"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:371
+#, fuzzy
+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 ""
+"将解析结果与 Cloudflare IP 范围进行匹配，当匹配成功时，使用 “自选 IP” 作为解"
+"析结果（实验性功能）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:343
+msgid "Maximum TTL"
+msgstr "覆盖最大 TTL 值（默认 0）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:337
+msgid "Minimum TTL"
+msgstr "覆盖最小 TTL 值（默认 0）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:344
+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:338
+msgid ""
+"Modify the Minimum 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:31
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:33
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:110
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:70
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:3
+msgid "MosDNS"
+msgstr "MosDNS"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:111
+msgid "MosDNS is a plugin-based DNS forwarder/traffic splitter."
+msgstr "MosDNS 是一个插件化的 DNS 转发/分流器。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:33
+msgid "NOT RUNNING"
+msgstr "未运行"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:236
+msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
+msgstr "自定义 Netflix、Disney+、Hulu 以及 “流媒体” 规则列表的 DNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:27
+msgid "No log data."
+msgstr "无日志数据。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:298
+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 "
+"Media DNS requests"
+msgstr ""
+"请提供您在访问国外网站时使用的 IP 地址，这个 IP 子网（0/24）将用作 远程 / 流"
+"媒体 DNS 请求的 ECS 地址"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:36
+msgid "Please wait, this may take a few moments..."
+msgstr "请稍候，这可能需要一点时间..."
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:303
+msgid "Prevent DNS Leaks"
+msgstr "防止 DNS 泄漏"
+
+#: 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 "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:228
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:245
+msgid "Quad9 Public DNS (9.9.9.9)"
+msgstr "Quad9 公共 DNS（9.9.9.9）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:31
+msgid "RUNNING"
+msgstr "运行中"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:23
+msgid "Redirect"
+msgstr "重定向"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:181
 msgid ""
 "Redirecting requests for domain names. Request domain A, but return records "
 "for domain B, for example: baidu.com qq.com (one rule per line)."
@@ -654,13 +643,148 @@ msgstr ""
 "重定向请求的域名。请求域名 A，但返回域名 B 的记录，如：baidu.com qq.com（每个"
 "规则一行）"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:217
-msgid ""
-"Added domain names will block PTR requests (one domain per line, supports "
-"domain matching rules)."
-msgstr "加入的域名将阻止 PTR 请求（每个域名一行，支持域名匹配规则）"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js:75
+msgid "Refresh every %s seconds."
+msgstr "每 %s 秒刷新。"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:247
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:191
+msgid "Remote DNS prefer IPv4"
+msgstr "远程 DNS 首选 IPv4"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:223
+msgid "Remote DNS server"
+msgstr "远程 DNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:11
+msgid "Rule Settings"
+msgstr "自定义规则列表"
+
+#: luci-app-mosdns/root/usr/share/luci/menu.d/luci-app-mosdns.json:22
+msgid "Rules"
+msgstr "规则列表"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:326
+msgid "Save the cache locally and reload the cache dump on the next startup"
+msgstr "保存缓存到本地文件，以供下次启动时重新载入使用"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:26
+msgid "Starting update..."
+msgstr ""
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:25
+msgid "Streaming Media"
+msgstr "流媒体"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:240
+msgid "Streaming Media DNS server"
+msgstr "流媒体 DNS 服务器"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:361
+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:279
+msgid "TCP/DoT Connection Multiplexing"
+msgstr "TCP/DoT 连接复用"
+
+#: 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 "Tencent Public DNS (119.28.28.28)"
+msgstr "腾讯公共 DNS（119.28.28.28）"
+
+#: 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 "Tencent Public DNS (119.29.29.29)"
+msgstr "腾讯公共 DNS（119.29.29.29）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:215
+msgid "Tencent Public DNS (DNS over HTTPS)"
+msgstr "腾讯公共 DNS（DNS over HTTPS）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:12
+msgid "The list of rules only apply to 'Default Config' profiles."
+msgstr "规则列表仅适用于 “内置预设” 配置文件。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:299
+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 ""
+"此功能通常在使用自建 DNS 服务器作为 远程 / 流媒体 DNS 上游时使用（需要上游服"
+"务器的支持）"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:431
+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 ""
+"这是文件 “/etc/mosdns/config_custom.yaml” 的内容，您的 MosDNS 配置将从此文件"
+"生成。仅接受 yaml 格式的配置内容。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:210
+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:211
+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:452
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:47
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:53
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:77
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:83
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:107
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:113
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:137
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:143
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:167
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:173
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:197
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:203
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:227
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:233
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:257
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:263
+msgid "Unable to save contents: %s"
+msgstr "无法保存内容：%s"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:94
+msgid "Update Cycle"
+msgstr "更新周期"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:85
+msgid "Update GeoIP & GeoSite databases"
+msgstr "更新广告规则、GeoIP & GeoSite 数据库"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:105
+msgid "Update Time"
+msgstr "更新时间"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:122
+msgid ""
+"Update data files with GitHub Proxy, leave blank to disable proxy downloads."
+msgstr "通过 GitHub 代理更新数据文件，留空则禁用代理下载。"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:78
+msgid "Update failed: %s"
+msgstr "更新失败: %s"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:49
+msgid "Update success"
+msgstr "更新成功"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:35
+msgid "Updating Database..."
+msgstr "更新数据库..."
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:167
+msgid "Warning"
+msgstr "警告"
+
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:241
 msgid ""
 "When enabling 'Custom Stream Media DNS', added domains will always use the "
 "'Streaming Media DNS server' for resolution (one domain per line, supports "
@@ -669,144 +793,28 @@ msgstr ""
 "启用 “自定义流媒体 DNS” 时，加入的域名始终使用 “流媒体 DNS 服务器” 进行解析"
 "（每个域名一行，支持域名匹配规则）"
 
-#: htdocs/luci-static/resources/view/mosdns/rules.js:284
-#: htdocs/luci-static/resources/view/mosdns/rules.js:288
-#, javascript-format
-msgid "Failed to restart mosdns: %s"
-msgstr "无法重启 MosDNS：%s"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:9
-msgid "Updating..."
-msgstr "更新中..."
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:10
-msgid "Please wait, this may take a few moments..."
-msgstr "请稍候，这可能需要一点时间..."
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:16
-msgid "Update success"
-msgstr "更新成功"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:19
-msgid "Update failed, Please check the network status"
-msgstr "更新失败，请检查网络状态"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:23
-#, fuzzy, javascript-format
-msgid "Update failed: %s"
-msgstr "更新失败: %s"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:30
-msgid "Update GeoIP & GeoSite databases"
-msgstr "更新广告规则、GeoIP & GeoSite 数据库"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:31
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:359
 msgid ""
-"Automatically update GeoIP and GeoSite databases as well as ad filtering "
-"rules through scheduled tasks."
-msgstr "通过定时任务自动更新 GeoIP 和 GeoSite 数据库以及广告过滤规则。"
+"When using custom rule sources, please use rule types supported by MosDNS "
+"(domain list or AdGuardHome rules)."
+msgstr ""
+"使用自定义规则来源时，请使用 MosDNS 支持的规则类型（域名列表或 AdGuardHome 规"
+"则）"
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:36
-msgid "Enable Auto Database Update"
-msgstr "启用自动更新"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js:18
+msgid "White Lists"
+msgstr "白名单"
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:39
-msgid "Update Cycle"
-msgstr "更新周期"
+#: 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 "Xinfeng Public DNS (114.114.114.114)"
+msgstr "信风公共 DNS（114.114.114.114）"
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:40
-msgid "Every Day"
-msgstr "每天"
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:213
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js:259
+msgid "Xinfeng Public DNS (114.114.115.115)"
+msgstr "信风公共 DNS（114.114.115.115）"
 
-#: htdocs/luci-static/resources/view/mosdns/update.js:41
-msgid "Every Monday"
-msgstr "每周一"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:42
-msgid "Every Tuesday"
-msgstr "每周二"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:43
-msgid "Every Wednesday"
-msgstr "每周三"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:44
-msgid "Every Thursday"
-msgstr "每周四"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:45
-msgid "Every Friday"
-msgstr "每周五"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:46
-msgid "Every Saturday"
-msgstr "每周六"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:47
-msgid "Every Sunday"
-msgstr "每周日"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:50
-msgid "Update Time"
-msgstr "更新时间"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:56
-msgid "GeoIP Type"
-msgstr "GeoIP 类型"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:57
-msgid "Little: only include Mainland China and Private IP addresses."
-msgstr "轻量：仅包含中国大陆和私有 IP 地址。"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:59
-msgid "Full: includes all Countries and Private IP addresses."
-msgstr "全量：包含所有国家和私有 IP 地址。"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:61
-msgid "Full"
-msgstr "全量"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:62
-msgid "Little"
-msgstr "轻量"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:66
-msgid "GitHub Proxy"
-msgstr "GitHub 代理"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:67
-msgid ""
-"Update data files with GitHub Proxy, leave blank to disable proxy downloads."
-msgstr "通过 GitHub 代理更新数据文件，留空则禁用代理下载。"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:68
+#: luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js:123
 msgid "https://gh-proxy.com"
 msgstr ""
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:73
-msgid "Check And Update GeoData."
-msgstr "检查并更新 GeoData 数据库。"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:74
-msgid "Database Update"
-msgstr "数据库更新"
-
-#: htdocs/luci-static/resources/view/mosdns/update.js:75
-msgid "Check And Update"
-msgstr "检查并更新"
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:14
-msgid "Basic Setting"
-msgstr "基本设置"
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:22
-msgid "Rules"
-msgstr "规则列表"
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:30
-msgid "Geodata Update"
-msgstr "更新数据库"
-
-#: root/usr/share/luci/menu.d/luci-app-mosdns.json:38
-msgid "Logs"
-msgstr "日志"
diff --git a/luci-app-mosdns/root/etc/config/mosdns b/luci-app-mosdns/root/etc/config/mosdns
index a00820b21..f448e6b84 100644
--- a/luci-app-mosdns/root/etc/config/mosdns
+++ b/luci-app-mosdns/root/etc/config/mosdns
@@ -6,6 +6,7 @@ config mosdns 'config'
 	option geo_auto_update '0'
 	option geo_update_week_time '*'
 	option geo_update_day_time '2'
+	option geoip_type 'geoip-only-cn-private'
 	option configfile '/var/etc/mosdns.json'
 	option log_level 'info'
 	option log_file '/var/log/mosdns.log'
diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns
index 59d8073dd..07675bfd8 100755
--- a/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/luci-app-mosdns/root/etc/init.d/mosdns
@@ -126,7 +126,7 @@ generate_config() {
 	# plugin: blocklist
 	json_add_object
 	json_add_string "tag" "blocklist"
-	json_add_string "type" "domain_set"
+	json_add_string "type" "adblock_set"
 	json_add_object "args"
 	json_add_array "files"
 	json_add_string "" "/etc/mosdns/rule/blocklist.txt"
@@ -176,7 +176,7 @@ generate_config() {
 	# plugin: adlist
 	json_add_object
 	json_add_string "tag" "adlist"
-	json_add_string "type" "domain_set"
+	json_add_string "type" "adblock_set"
 	json_add_object "args"
 	json_add_array "files"
 	adlist=$($MOSDNS_SCRIPT get_adlist)
diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc b/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc
index cf0a537a4..487a369c8 100755
--- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc
+++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc
@@ -2,7 +2,7 @@
 
 'use strict';
 
-import { popen, mkdir, unlink, writefile, open, stat} from 'fs';
+import { popen, mkdir, unlink, writefile, open, stat, stdout } from 'fs';
 import { cursor } from 'uci';
 import { connect } from 'ubus';
 
@@ -148,6 +148,7 @@ function update_adlist() {
 			}
 
 			print(`Downloading ${mirror}${url}\n`);
+			stdout.flush();
 			let curl_res = exec_sys(`curl --connect-timeout 5 -m 90 --ipv4 -kfSLo "${ad_tmpdir}/${filename}" "${mirror}${url}"`);
 			if (curl_res.code !== 0) download_failed = true;
 		}
@@ -191,6 +192,7 @@ function update_geodat() {
 	let geoip_url = mirror + "https://github.com/Loyalsoldier/geoip/releases/latest/download/" + geoip_type + ".dat";
 
 	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}"`); exit(1);
 	}
@@ -203,8 +205,10 @@ function update_geodat() {
 
 	if (geoip_sum_local === geoip_sum_remote) {
 		print("geoip.dat is up to date.\n");
+		stdout.flush();
 	} else {
 		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}"`); exit(1);
 		}
@@ -221,6 +225,7 @@ function update_geodat() {
 	let geosite_url = mirror + "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat";
 
 	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}"`); exit(1);
 	}
@@ -233,8 +238,10 @@ function update_geodat() {
 
 	if (geosite_sum_local === geosite_sum_remote) {
 		print("geosite.dat is up to date.\n");
+		stdout.flush();
 	} else {
 		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}"`); exit(1);
 		}
@@ -313,9 +320,23 @@ switch (action) {
 		get_adlist();
 		break;
 	case "update":
-		update_geodat();
-		update_adlist();
-		v2dat_dump();
+		if (stat('/var/lock/mosdns_update.lock')) {
+			print("Another update is already in progress.\n");
+			exit(1);
+		}
+		writefile('/var/lock/mosdns_update.lock', '');
+		try {
+			update_geodat();
+			update_adlist();
+			v2dat_dump();
+			print("UPDATE_FINISHED\n");
+			stdout.flush();
+		} catch (e) {
+			print("Update failed: " + e + "\n");
+			print("UPDATE_FINISHED\n");
+			stdout.flush();
+		}
+		unlink('/var/lock/mosdns_update.lock');
 		break;
 	case "update_adlist":
 		update_adlist();
diff --git a/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json b/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
index 438fefcc3..9c7d23ad8 100644
--- a/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
+++ b/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
@@ -18,7 +18,9 @@
 					"clean_log",
 					"flush_cache",
 					"get_version",
-					"print_log"
+					"print_log",
+					"get_update_log",
+					"start_update"
 				]
 			},
 			"uci": [ "mosdns" ]
diff --git a/luci-app-mosdns/root/usr/share/rpcd/ucode/luci.mosdns b/luci-app-mosdns/root/usr/share/rpcd/ucode/luci.mosdns
index 25247d21b..9804ad583 100644
--- a/luci-app-mosdns/root/usr/share/rpcd/ucode/luci.mosdns
+++ b/luci-app-mosdns/root/usr/share/rpcd/ucode/luci.mosdns
@@ -119,6 +119,35 @@ const methods = {
 				return { error: res.stdout };
 			}
 		}
+	},
+
+	start_update: {
+		call: function() {
+			try {
+				if (stat('/var/lock/mosdns_update.lock')) {
+					return { success: false, error: 'Another update is already in progress.' };
+				}
+				exec_sys('echo "" > /var/log/mosdns_update.log');
+				exec_sys('{ /usr/share/mosdns/mosdns.uc update; rm -f /var/lock/mosdns_update.lock; echo "UPDATE_FINISHED"; } > /var/log/mosdns_update.log 2>&1 &');
+				return { success: true };
+			} catch (e) {
+				return { success: false, error: String(e) };
+			}
+		}
+	},
+
+	get_update_log: {
+		call: function() {
+			try {
+				if (stat('/var/log/mosdns_update.log')) {
+					return { log: readfile('/var/log/mosdns_update.log') };
+				} else {
+					return { log: '' };
+				}
+			} catch (e) {
+				return { error: String(e) };
+			}
+		}
 	}
 };
 
diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index 71596a3f2..b19f5340c 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.4.15
-PKG_RELEASE:=105
+PKG_RELEASE:=106
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
index 456321405..3227e3f19 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
@@ -610,7 +610,7 @@ o.validate = function(self, value, t)
 		local _dns_mode = s.fields["dns_mode"]:formvalue(t)
 		local _tcp_node = s.fields["tcp_node"]:formvalue(t)
 		if _dns_mode and _tcp_node then
-			if (m:get(_tcp_node, "type") or ""):lower() ~= _dns_mode then
+			if (m:get(_tcp_node, "type") or ""):lower() ~= _dns_mode and not _tcp_node:find("Socks_") then
 				return nil, translatef("TCP node must be '%s' type to use FakeDNS.", _dns_mode)
 			end
 		end
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 bb4e95a63..dfa7994a9 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -486,7 +486,7 @@ o.validate = function(self, value, t)
 		end
 		local _tcp_node = s.fields["tcp_node"]:formvalue(t)
 		if _dns_mode and _tcp_node then
-			if (m:get(_tcp_node, "type") or ""):lower() ~= _dns_mode then
+			if (m:get(_tcp_node, "type") or ""):lower() ~= _dns_mode and not _tcp_node:find("Socks_") then
 				return nil, translatef("TCP node must be '%s' type to use FakeDNS.", _dns_mode)
 			end
 		end
diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
index 374e5628e..f3abedbd2 100644
--- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua
+++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
@@ -1706,8 +1706,7 @@ function gen_config(var)
 				end
 			end)
 		else
-			local _node = node or node_id
-			COMMON.default_outbound_tag = gen_outbound_get_tag(flag, _node, nil, {
+			COMMON.default_outbound_tag = gen_outbound_get_tag(flag, node or node_id, nil, {
 				fragment = singbox_settings.fragment == "1" or nil,
 				record_fragment = singbox_settings.record_fragment == "1" or nil,
 				run_socks_instance = not no_run
diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua
index 00b05d070..753a4ce77 100644
--- a/luci-app-passwall/luasrc/passwall/util_xray.lua
+++ b/luci-app-passwall/luasrc/passwall/util_xray.lua
@@ -1424,8 +1424,7 @@ function gen_config(var)
 				rules = rules
 			}
 		else
-			local _node = node or node_id
-			COMMON.default_outbound_tag = gen_outbound_get_tag(flag, _node, nil, {
+			COMMON.default_outbound_tag = gen_outbound_get_tag(flag, node or node_id, nil, {
 				fragment = xray_settings.fragment == "1" or nil,
 				noise = xray_settings.noise == "1" or nil,
 				run_socks_instance = not no_run
diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh
index cb9e4aa6b..34f3c200c 100755
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -1660,8 +1660,17 @@ acl_app() {
 							set_cache_var "ACL_${sid}_dns_port" "${GLOBAL_DNSMASQ_PORT}"
 							set_cache_var "ACL_${sid}_tcp_default" "1"
 						else
-							local type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
-							local protocol=$(config_n_get $tcp_node protocol)
+							local type protocol
+							if [ "$(config_get_type ${tcp_node#Socks_})" = "socks" ]; then
+								if [ "${dns_mode}" = "xray" ]; then
+									type="xray"
+								elif [ "${dns_mode}" = "sing-box" ]; then
+									type="sing-box"
+								fi
+							else
+								type=$(echo $(config_n_get $tcp_node type) | tr 'A-Z' 'a-z')
+								protocol=$(config_n_get $tcp_node protocol)
+							fi
 							#兼容旧模式，择机移除
 							[ "$v2ray_dns_mode" = "tcp+doh" ] && v2ray_dns_mode="tcp"
 							([ "$type" = "sing-box" ] || [ "$type" = "xray" ]) && [ "$protocol" = "_shunt" ] && [ "$type" != "$dns_mode" ] && {
@@ -1743,7 +1752,7 @@ acl_app() {
 								lua $APP_PATH/helper_dnsmasq.lua add_rule -FLAG ${sid} -TMP_DNSMASQ_PATH ${dnsmasq_conf_path} -DNSMASQ_CONF_FILE ${dnsmasq_conf} \
 									-LISTEN_PORT ${dnsmasq_port} -DEFAULT_DNS ${DEFAULT_DNS} -LOCAL_DNS $LOCAL_DNS \
 									-USE_DIRECT_LIST "${use_direct_list}" -USE_PROXY_LIST "${use_proxy_list}" -USE_BLOCK_LIST "${use_block_list}" -USE_GFW_LIST "${use_gfw_list}" -CHN_LIST "${chn_list}" \
-									-TUN_DNS "127.0.0.1#${_dns_port}" -REMOTE_FAKEDNS 0 -USE_DEFAULT_DNS "${use_default_dns:-direct}" -CHINADNS_DNS ${_china_ng_listen:-0} \
+									-TUN_DNS "127.0.0.1#${_dns_port}" -REMOTE_FAKEDNS ${remote_fakedns:-0} -USE_DEFAULT_DNS "${use_default_dns:-direct}" -CHINADNS_DNS ${_china_ng_listen:-0} \
 									-TCP_NODE $tcp_node -DEFAULT_PROXY_MODE ${tcp_proxy_mode} -NO_PROXY_IPV6 ${dnsmasq_filter_proxy_ipv6:-0} -NFTFLAG ${nftflag:-0} \
 									-NO_LOGIC_LOG 1
 								ln_run "$(first_type dnsmasq)" "dnsmasq_${sid}" "/dev/null" -C ${dnsmasq_conf} -x ${acl_path}/dnsmasq.pid
@@ -1783,7 +1792,7 @@ acl_app() {
 										[ "$filter_proxy_ipv6" = "1" ] && remote_dns_query_strategy="UseIPv4"
 										remote_dns_doh=${remote_dns_doh:-https://1.1.1.1/dns-query}
 										_extra_param="${_extra_param} dns_listen_port=${_dns_port} remote_dns_protocol=${v2ray_dns_mode} remote_dns_udp_server=${remote_dns} remote_dns_tcp_server=${remote_dns}"
-										_extra_param="${_extra_param} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${remote_dns_query_strategy} remote_dns_client_ip=${remote_dns_client_ip}"
+										_extra_param="${_extra_param} remote_dns_doh=${remote_dns_doh} remote_dns_query_strategy=${remote_dns_query_strategy} remote_fakedns=${remote_fakedns:-0} remote_dns_client_ip=${remote_dns_client_ip}"
 									}
 									_extra_param="${_extra_param} tcp_proxy_way=$TCP_PROXY_WAY"
 									[ -n "$udp_node" ] && ([ "$udp_node" = "tcp" ] || [ "$udp_node" = "$tcp_node" ]) && {
@@ -1849,7 +1858,16 @@ acl_app() {
 								set_cache_var "node_${udp_node}_redir_port" "${redir_port}"
 								udp_port=$redir_port
 
-								local type=$(echo $(config_n_get $udp_node type) | tr 'A-Z' 'a-z')
+								local type
+								if [ "$(config_get_type ${udp_node#Socks_})" = "socks" ]; then
+									if [ "${dns_mode}" = "xray" ]; then
+										type="xray"
+									elif [ "${dns_mode}" = "sing-box" ]; then
+										type="sing-box"
+									fi
+								else
+									type=$(echo $(config_n_get $udp_node type) | tr 'A-Z' 'a-z')
+								fi
 								if [ -n "${type}" ] && ([ "${type}" = "sing-box" ] || [ "${type}" = "xray" ]); then
 									config_file="acl/${udp_node}_UDP_${redir_port}.json"
 									config_file="$TMP_PATH/$config_file"
diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index 37d4eec27..ec5d2a93b 100644
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=26.4.20
-PKG_RELEASE:=40
+PKG_VERSION:=26.5.1
+PKG_RELEASE:=41
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/shunt_rules.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/shunt_rules.lua
index e93018136..e154fa84c 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/shunt_rules.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/shunt_rules.lua
@@ -61,6 +61,7 @@ end
 protocol = s:option(MultiValue, "protocol", translate("Protocol"))
 protocol:value("http")
 protocol:value("tls")
+protocol:value("quic")
 protocol:value("bittorrent")
 protocol.widget = "checkbox"
 protocol.default = nil
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua
index f50db48a8..9d05dbbb6 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/hysteria2.lua
@@ -51,7 +51,6 @@ o = s:option(Flag, _n("tls_allowInsecure"), translate("allowInsecure"), translat
 o.default = "0"
 
 o = s:option(Value, _n("tls_pinSHA256"), translate("PinSHA256"),translate("Certificate fingerprint"))
-o.rewrite_option = o.option
 
 o = s:option(Value, _n("up_mbps"), translate("Max upload Mbps"))
 o.rewrite_option = o.option
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
index 27b9f40a3..cb0d9ae1f 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
@@ -374,7 +374,7 @@ if api.compare_versions(os.date("%Y.%m.%d"), "<", "2026.6.1") then
 end
 
 if api.compare_versions(xray_version, ">=", "26.1.31") then
-	o = s:option(Value, _n("tls_CertSha"), translate("TLS Chain Fingerprint (SHA256)"), translate("Once set, connects only when the server’s chain fingerprint matches."))
+	o = s:option(Value, _n("tls_pinSHA256"), translate("TLS Chain Fingerprint (SHA256)"))
 	o:depends({ [_n("tls")] = true, [_n("reality")] = false })
 	o:depends({ [_n("protocol")] = "hysteria2" })
 
@@ -506,6 +506,11 @@ o:depends({ [_n("transport")] = "mkcp" })
 o = s:option(Value, _n("mkcp_domain"), translate("Camouflage Domain"), translate("Use it together with the DNS disguised type. You can fill in any domain."))
 o:depends({ [_n("mkcp_guise")] = "dns" })
 
+o = s:option(Value, _n("mkcp_mtu"), translate("KCP MTU"))
+o.datatype = "uinteger"
+o.default = 1350
+o:depends({ [_n("transport")] = "mkcp" })
+
 o = s:option(Value, _n("mkcp_seed"), translate("KCP Seed"))
 o:depends({ [_n("transport")] = "mkcp" })
 
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
index cb2aba71c..a20b03bb7 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
@@ -356,6 +356,11 @@ o:depends({ [_n("transport")] = "mkcp" })
 o = s:option(Value, _n("mkcp_domain"), translate("Camouflage Domain"), translate("Use it together with the DNS disguised type. You can fill in any domain."))
 o:depends({ [_n("mkcp_guise")] = "dns" })
 
+o = s:option(Value, _n("mkcp_mtu"), translate("KCP MTU"))
+o.datatype = "uinteger"
+o.default = 1350
+o:depends({ [_n("transport")] = "mkcp" })
+
 o = s:option(Value, _n("mkcp_seed"), translate("KCP Seed"))
 o:depends({ [_n("transport")] = "mkcp" })
 
diff --git a/luci-app-passwall2/luasrc/passwall2/api.lua b/luci-app-passwall2/luasrc/passwall2/api.lua
index 3a3e43ef9..5bcfcfbef 100644
--- a/luci-app-passwall2/luasrc/passwall2/api.lua
+++ b/luci-app-passwall2/luasrc/passwall2/api.lua
@@ -122,21 +122,17 @@ function get_new_port()
 end
 
 function exec_call(cmd)
-	local process = io.popen(cmd .. '; echo -e "\n$?"')
-	local lines = {}
-	local result = ""
-	local return_code
-	for line in process:lines() do
-		lines[#lines + 1] = line
+	math.randomseed(os.time())
+	local tag = "\x01__RC__" .. tostring(math.random(100000, 999999)) .. "\x01"
+	local f = io.popen('(' .. cmd .. '); printf "\\n' .. tag .. '%d" "$?"')
+	local out = f:read("*a") or ""
+	f:close()
+	local rc = out:match(tag .. "(%d+)%s*$")
+	if not rc then
+		return 255, trim(out)
 	end
-	process:close()
-	if #lines > 0 then
-		return_code = lines[#lines]
-		for i = 1, #lines - 1 do
-			result = result .. lines[i] .. ((i == #lines - 1) and "" or "\n")
-		end
-	end
-	return tonumber(return_code), trim(result)
+	out = out:gsub("\n?" .. tag .. "%d+%s*$", "")
+	return tonumber(rc), trim(out)
 end
 
 function base64Decode(text)
diff --git a/luci-app-passwall2/luasrc/passwall2/util_hysteria2.lua b/luci-app-passwall2/luasrc/passwall2/util_hysteria2.lua
index a06928a4c..6fd0103bb 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_hysteria2.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_hysteria2.lua
@@ -93,7 +93,7 @@ function gen_config(var)
 		tls = {
 			sni = node.tls_serverName,
 			insecure = (node.tls_allowInsecure == "1") and true or false,
-			pinSHA256 = (node.hysteria2_tls_pinSHA256) and node.hysteria2_tls_pinSHA256 or nil,
+			pinSHA256 = (node.tls_pinSHA256) and node.tls_pinSHA256 or nil,
 		},
 		quic = {
 			initStreamReceiveWindow = (node.hysteria2_recv_window) and tonumber(node.hysteria2_recv_window) or nil,
diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index 5ccfba884..273c668f0 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -173,14 +173,14 @@ function gen_outbound(flag, node, tag, proxy_table)
 				tlsSettings = (node.stream_security == "tls") and {
 					serverName = node.tls_serverName,
 					allowInsecure = (function()
-								if node.tls_CertSha and node.tls_CertSha ~= "" then return nil end
+								if node.tls_pinSHA256 and node.tls_pinSHA256 ~= "" then return nil end
 								if api.compare_versions(os.date("%Y.%m.%d"), "<", "2026.6.1") and node.tls_allowInsecure == "1" then return true end
 							end)(),
 					fingerprint = (node.type == "Xray" and node.utls == "1" and node.fingerprint and node.fingerprint ~= "") and node.fingerprint or nil,
 					pinnedPeerCertSha256 = (function()
 								if api.compare_versions(xray_version, "<", "26.1.31") then return nil end
-								if not node.tls_CertSha then return "" end
-								return node.tls_CertSha
+								if not node.tls_pinSHA256 then return "" end
+								return node.tls_pinSHA256
 							end)(),
 					verifyPeerCertByName = (function()
 								if api.compare_versions(xray_version, "<", "26.1.31") then return nil end
@@ -217,7 +217,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 					}
 				} or nil,
 				kcpSettings = (node.transport == "mkcp") and {
-					mtu = 1350,
+					mtu = (node.mkcp_mtu and node.mkcp_mtu ~= "") and tonumber(node.mkcp_mtu) or 1350,
 					tti = 50,
 					uplinkCapacity = 12,
 					downlinkCapacity = 100,
@@ -470,7 +470,6 @@ function gen_outbound(flag, node, tag, proxy_table)
 				finalQuery = true,
 				disableCache = false,
 				serveStale = true,
-				serveExpiredTTL = 30,
 			}
 		end
 
@@ -674,7 +673,7 @@ function gen_config_server(node)
 						}
 					} or nil,
 					kcpSettings = (node.transport == "mkcp") and {
-						mtu = 1350,
+						mtu = (node.mkcp_mtu and node.mkcp_mtu ~= "") and tonumber(node.mkcp_mtu) or 1350,
 						tti = 50,
 						uplinkCapacity = 12,
 						downlinkCapacity = 100,
@@ -1639,7 +1638,6 @@ function gen_config(var)
 					finalQuery = true,
 					disableCache = false,
 					serveStale = true,
-					serveExpiredTTL = 30,
 				})
 			end
 		end
@@ -1738,6 +1736,7 @@ function gen_config(var)
 							end
 						end
 						local dns_block_mode = "host"
+						dns_block_mode = ""
 						if dns_block_mode == "host" and dns_outboundTag == "blackhole" then
 							for d_i, d_k in ipairs(value.domain) do
 								dns.hosts[d_k] = "0.0.0.0"
@@ -2162,7 +2161,6 @@ function gen_front_dns_config(var)
 				finalQuery = true,
 				disableCache = false,
 				serveStale = true,
-				serveExpiredTTL = 30,
 			})
 		end
 	end
diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/footer.htm b/luci-app-passwall2/luasrc/view/passwall2/global/footer.htm
index b5c8becf4..590e45a4d 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/global/footer.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/global/footer.htm
@@ -16,6 +16,22 @@ local appname = api.appname
 	display: none !important;
 	visibility: hidden !important;
 }
+
+@media screen and (max-width: 1152px) {
+	#cbi-<%=appname%>-socks .cbi-section-table-titles {
+		display: none !important;
+	}
+}
+
+@media screen and (min-width: 1152px) {
+	#cbi-<%=appname%>-socks input[id*=".<%=appname%>."][id$=".port"],
+	#cbi-<%=appname%>-socks input[id*=".<%=appname%>."][id$=".http_port"] {
+		width: 100px !important;
+		min-width: unset !important;
+		max-width: unset !important;
+		text-align: center !important;
+	}
+}
 </style>
 <script type="text/javascript">
 	//<![CDATA[
@@ -128,7 +144,7 @@ local appname = api.appname
 			}
 		}
 	}
-	document.addEventListener("DOMContentLoaded", function () {
+	document.addEventListener("DOMContentLoaded", () => setTimeout(() => {
 		const hiddenSelect = document.getElementById("cbid.<%=appname%>.<%=self.global_cfgid%>.node");
 		let o_val = hiddenSelect.value
 		const o_hasItem = shunt_list.find(element => element.id == o_val);
@@ -169,7 +185,7 @@ local appname = api.appname
 			}
 		}
 		go();
-	});
+	}, 100));
 	//setTimeout("go()", 1000);
 	//]]>
 </script>
\ No newline at end of file
diff --git a/luci-app-passwall2/luasrc/view/passwall2/haproxy/js.htm b/luci-app-passwall2/luasrc/view/passwall2/haproxy/js.htm
index 8109b4cc8..aca4d853b 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/haproxy/js.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/haproxy/js.htm
@@ -1,7 +1,8 @@
 <%
 local api = require "luci.passwall2.api"
+local appname = api.appname
 -%>
-<script src="<%=resource%>/view/<%=api.appname%>/Sortable.min.js"></script>
+<script src="<%=resource%>/view/<%=appname%>/Sortable.min.js"></script>
 
 <style>
 table .cbi-button-up,
@@ -34,6 +35,34 @@ table .cbi-button-down,
 	background-color: rgba(131, 191, 255, 0.7) !important;
 	box-shadow: 0 4px 6px rgba(0,0,0,0.1);
 }
+
+@media screen and (max-width: 1152px) {
+	#cbi-<%=appname%>-haproxy_config .cbi-section-table-titles {
+		display: none !important;
+	}
+}
+
+@media screen and (min-width: 1152px) {
+	#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".haproxy_port"],
+	#cbi-<%=appname%>-haproxy_config input[id*=".<%=appname%>."][id$=".lbweight"] {
+		width: 100px !important;
+		min-width: unset !important;
+		max-width: unset !important;
+		text-align: center !important;
+	}
+
+	#cbi-<%=appname%>-haproxy_config select[id*=".<%=appname%>."][id$=".export"] {
+		width: 130px !important;
+		min-width: unset !important;
+		max-width: unset !important;
+	}
+
+	#cbi-<%=appname%>-haproxy_config select[id*=".<%=appname%>."][id$=".backup"] {
+		width: 100px !important;
+		min-width: unset !important;
+		max-width: unset !important;
+	}
+}
 </style>
 <script type="text/javascript">
 	//<![CDATA[
@@ -85,7 +114,7 @@ table .cbi-button-down,
 	//节点列表添加拖拽排序
 	document.addEventListener("DOMContentLoaded", function () {
 		function initSortableForTable() {
-			var section = document.getElementById("cbi-<%=api.appname%>-haproxy_config");
+			var section = document.getElementById("cbi-<%=appname%>-haproxy_config");
 			if (!section) return;
 
 			hideSortColumn(section);
@@ -139,8 +168,8 @@ table .cbi-button-down,
 			var rows = root.querySelectorAll("tr.cbi-section-table-row");
 			rows.forEach(function (tr) {
 				var id = tr.id || "";
-				if (id.startsWith("cbi-<%=api.appname%>-"))
-					id = id.replace("cbi-<%=api.appname%>-", "");
+				if (id.startsWith("cbi-<%=appname%>-"))
+					id = id.replace("cbi-<%=appname%>-", "");
 				order.push(id);
 			});
 			return order;
diff --git a/luci-app-passwall2/luasrc/view/passwall2/include/shunt_options.htm b/luci-app-passwall2/luasrc/view/passwall2/include/shunt_options.htm
index b78b4967e..9dcc05c76 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/include/shunt_options.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/include/shunt_options.htm
@@ -53,7 +53,7 @@
 			}
 		}
 	}
-	document.addEventListener("DOMContentLoaded", function () {
+	document.addEventListener("DOMContentLoaded", () => setTimeout(() => {
 		refresh_depends();
 		const table_dom = document.getElementById("cbi-passwall2-shunt_option_list");
 		if (table_dom) {
@@ -71,6 +71,6 @@
 				}
 			}
 		}
-	});
+	}, 100));
 	//]]>
 </script>
\ No newline at end of file
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_config/link_share_man.htm b/luci-app-passwall2/luasrc/view/passwall2/node_config/link_share_man.htm
index d1941043b..e6631f3be 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_config/link_share_man.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_config/link_share_man.htm
@@ -306,7 +306,7 @@ local current_node = map:get(section)
 					params += opt.query("alpn", dom_prefix + "alpn");
 					params += opt.query("sni", dom_prefix + "tls_serverName");
 					params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-					params += opt.query("pcs", dom_prefix + "tls_CertSha");
+					params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 					params += opt.query("vcn", dom_prefix + "tls_CertByName");
 					params += opt.query("ech", dom_prefix + "ech_config");
 				}
@@ -499,7 +499,7 @@ local current_node = map:get(section)
 				params += opt.query("alpn", dom_prefix + "alpn");
 				params += opt.query("sni", dom_prefix + "tls_serverName");
 				params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-				params += opt.query("pcs", dom_prefix + "tls_CertSha");
+				params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 				params += opt.query("vcn", dom_prefix + "tls_CertByName");
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
@@ -570,7 +570,7 @@ local current_node = map:get(section)
 				params += opt.query("alpn", dom_prefix + "alpn");
 				params += opt.query("sni", dom_prefix + "tls_serverName");
 				params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure");
-				params += opt.query("pcs", dom_prefix + "tls_CertSha");
+				params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 				params += opt.query("vcn", dom_prefix + "tls_CertByName");
 				params += opt.query("ech", dom_prefix + "ech_config");
 			}
@@ -591,14 +591,14 @@ local current_node = map:get(section)
 			var params = "";
 			params += opt.query("sni", dom_prefix + "tls_serverName");
 			params += opt.query("insecure", dom_prefix + "tls_allowInsecure");
-			params += opt.query("pcs", dom_prefix + "tls_CertSha");
+			params += opt.query("pinSHA256", dom_prefix + "tls_pinSHA256");
+			params += opt.query("pcs", dom_prefix + "tls_pinSHA256");
 			params += opt.query("vcn", dom_prefix + "tls_CertByName");
 			
 			var v_password = null;
 			
 			if (v_type === "Hysteria2") {
 				v_password = opt.get("hysteria2_auth_password");
-				params += opt.query("pinSHA256", "hysteria2_tls_pinSHA256");
 				var dom_obfs = opt.get("hysteria2_obfs");
 				if (dom_obfs && dom_obfs.value != "") {
 					params += "&obfs=" + "salamander";
@@ -1069,7 +1069,7 @@ local current_node = map:get(section)
 						}
 						opt.set(dom_prefix + 'ech', !!queryParam.ech);
 						opt.set(dom_prefix + 'ech_config', queryParam.ech || '');
-						opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+						opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 						opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 					}
 
@@ -1308,7 +1308,7 @@ local current_node = map:get(section)
 			if (queryParam.security === "tls") {
 				opt.set(dom_prefix + 'tls_serverName', queryParam.peer || queryParam.sni || "");
 				opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
-				opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+				opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 				opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 			}
 			opt.set(
@@ -1472,7 +1472,7 @@ local current_node = map:get(section)
 					}
 					opt.set(dom_prefix + 'ech', !!queryParam.ech);
 					opt.set(dom_prefix + 'ech_config', queryParam.ech || '');
-					opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+					opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || '');
 					opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 				}
 
@@ -1613,9 +1613,6 @@ local current_node = map:get(section)
 				if (queryParam["obfs-password"] || queryParam["obfs_password"]) {
 					opt.set(dom_prefix + 'obfs', queryParam["obfs-password"] || queryParam["obfs_password"]);
 				}
-				if (queryParam.pinSHA256) {
-					opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pinSHA256);
-				}
 				opt.set(dom_prefix + 'hop', queryParam.mport || "");
 			}
 			
@@ -1627,7 +1624,7 @@ local current_node = map:get(section)
 				dom_prefix + 'tls_allowInsecure',
 				!((queryParam.allowinsecure ?? '0') === '0' && (queryParam.allowInsecure ?? '0') === '0' && (queryParam.insecure ?? '0') === '0')
 			);
-			opt.set(dom_prefix + 'tls_CertSha', queryParam.pcs || '');
+			opt.set(dom_prefix + 'tls_pinSHA256', queryParam.pcs || queryParam.pinSHA256 || '');
 			opt.set(dom_prefix + 'tls_CertByName', queryParam.vcn || '');
 			if (m.hash) {
 				opt.set('remarks', decodeURIComponent(m.hash.substr(1)));
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_subscribe/js.htm b/luci-app-passwall2/luasrc/view/passwall2/node_subscribe/js.htm
index df342368b..a090a2ead 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_subscribe/js.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_subscribe/js.htm
@@ -34,6 +34,12 @@ table .cbi-button-down,
 	background-color: rgba(131, 191, 255, 0.7) !important;
 	box-shadow: 0 4px 6px rgba(0,0,0,0.1);
 }
+
+@media screen and (max-width: 1152px) {
+	#cbi-<%=api.appname%>-subscribe_list .cbi-section-table-titles {
+		display: none !important;
+	}
+}
 </style>
 
 <script type="text/javascript">
diff --git a/luci-app-passwall2/po/fa/passwall2.po b/luci-app-passwall2/po/fa/passwall2.po
index 639220d8a..36738e51a 100644
--- a/luci-app-passwall2/po/fa/passwall2.po
+++ b/luci-app-passwall2/po/fa/passwall2.po
@@ -2230,6 +2230,12 @@ msgstr "ورودی %s:%s"
 msgid "Node: %s:%s, Weight: %s"
 msgstr "گره: %s:%s، وزن: %s"
 
+msgid "[Rule update] instance is running; please try again later."
+msgstr "نمونه [به‌روزرسانی قانون] در حال اجرا است؛ لطفاً بعداً دوباره امتحان کنید."
+
+msgid "[Subscription] instance is running; [Rule Update] queue and wait."
+msgstr "نمونه [اشتراک] در حال اجرا است؛ [به‌روزرسانی قانون] در صف انتظار قرار می‌گیرد."
+
 msgid "Start updating the rules..."
 msgstr "شروع به‌روزرسانی قوانین..."
 
@@ -2383,6 +2389,12 @@ msgstr "دریافت محتوای اشتراک برای [%s] خالی است. ا
 msgid "Proxy"
 msgstr "پروکسی"
 
+msgid "[Subscription] instance is running; please try again later."
+msgstr "نمونه [اشتراک] در حال اجرا است؛ لطفاً بعداً دوباره امتحان کنید."
+
+msgid "[Rule Update] instance is running; [Subscription] queue and wait."
+msgstr "نمونه [به‌روزرسانی قانون] در حال اجرا است؛ [اشتراک] در صف انتظار قرار دارد."
+
 msgid "Start subscribing..."
 msgstr "شروع اشتراک‌گیری..."
 
diff --git a/luci-app-passwall2/po/ru/passwall2.po b/luci-app-passwall2/po/ru/passwall2.po
index 6ccc3aab3..ee82c72c7 100644
--- a/luci-app-passwall2/po/ru/passwall2.po
+++ b/luci-app-passwall2/po/ru/passwall2.po
@@ -2228,6 +2228,12 @@ msgstr "Вход %s:%s"
 msgid "Node: %s:%s, Weight: %s"
 msgstr "Сервер: %s:%s, вес: %s"
 
+msgid "[Rule update] instance is running; please try again later."
+msgstr "Экземпляр [Обновление правила] запущен; пожалуйста, попробуйте позже."
+
+msgid "[Subscription] instance is running; [Rule Update] queue and wait."
+msgstr "Экземпляр [Подписка] запущен; [Обновление правила] поставить в очередь и ждать."
+
 msgid "Start updating the rules..."
 msgstr "Начало обновления правил..."
 
@@ -2381,6 +2387,12 @@ msgstr "Содержимое подписки [%s] пусто. Возможно,
 msgid "Proxy"
 msgstr "Прокси"
 
+msgid "[Subscription] instance is running; please try again later."
+msgstr "Экземпляр [Подписки] запущен; пожалуйста, попробуйте позже."
+
+msgid "[Rule Update] instance is running; [Subscription] queue and wait."
+msgstr "Экземпляр [Обновление правила] запущен; [Подписка] ставится в очередь и ожидает."
+
 msgid "Start subscribing..."
 msgstr "Начало подписки..."
 
diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po
index 4305a01fb..ec3ccca0a 100644
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@@ -2222,6 +2222,12 @@ msgstr "入口 %s:%s"
 msgid "Node: %s:%s, Weight: %s"
 msgstr "节点：%s:%s，权重：%s"
 
+msgid "[Rule update] instance is running; please try again later."
+msgstr "[规则更新]实例正在运行，请稍后再试..."
+
+msgid "[Subscription] instance is running; [Rule Update] queue and wait."
+msgstr "[订阅]实例正在运行，[规则更新]进入队列等待..."
+
 msgid "Start updating the rules..."
 msgstr "开始更新规则..."
 
@@ -2375,6 +2381,12 @@ msgstr "获取到的【%s】订阅内容为空，可能是订阅地址无效，
 msgid "Proxy"
 msgstr "代理"
 
+msgid "[Subscription] instance is running; please try again later."
+msgstr "[订阅]实例正在运行，请稍后再试..."
+
+msgid "[Rule Update] instance is running; [Subscription] queue and wait."
+msgstr "[规则更新]实例正在运行，[订阅]进入队列等待..."
+
 msgid "Start subscribing..."
 msgstr "开始订阅..."
 
diff --git a/luci-app-passwall2/po/zh-tw/passwall2.po b/luci-app-passwall2/po/zh-tw/passwall2.po
index 65f3cc50b..87449b177 100644
--- a/luci-app-passwall2/po/zh-tw/passwall2.po
+++ b/luci-app-passwall2/po/zh-tw/passwall2.po
@@ -2222,6 +2222,12 @@ msgstr "入口 %s:%s"
 msgid "Node: %s:%s, Weight: %s"
 msgstr "節點：%s:%s，權重：%s"
 
+msgid "[Rule update] instance is running; please try again later."
+msgstr "[規則更新]實例正在運行，請稍後再試..."
+
+msgid "[Subscription] instance is running; [Rule Update] queue and wait."
+msgstr "[訂閱]實例正在運行，[規則更新]進入隊列等待..."
+
 msgid "Start updating the rules..."
 msgstr "開始更新規則..."
 
@@ -2375,6 +2381,12 @@ msgstr "獲取到的【%s】訂閱內容為空，可能是訂閱地址無效，
 msgid "Proxy"
 msgstr "代理"
 
+msgid "[Subscription] instance is running; please try again later."
+msgstr "[訂閱]實例正在運行，請稍後再試..."
+
+msgid "[Rule Update] instance is running; [Subscription] queue and wait."
+msgstr "[規則更新]實例正在運行，[訂閱]進入隊列等待..."
+
 msgid "Start subscribing..."
 msgstr "開始訂閱..."
 
diff --git a/luci-app-passwall2/root/etc/init.d/passwall2 b/luci-app-passwall2/root/etc/init.d/passwall2
index 4f1b5b6fd..dfc587302 100755
--- a/luci-app-passwall2/root/etc/init.d/passwall2
+++ b/luci-app-passwall2/root/etc/init.d/passwall2
@@ -64,6 +64,15 @@ stop() {
 restart() {
 	set_lock
 	[ $? == 1 ] && log_i18n 0 "The script is already running, do not run it again. Exit." && exit 0
+	rule_lock=${LOCK_FILE_DIR}/${CONFIG}_rule_update.lock
+	sub_lock=${LOCK_FILE_DIR}/${CONFIG}_subscribe.lock
+	for i in $(seq 1 300); do
+		if [ ! -f "$rule_lock" ] && [ ! -f "$sub_lock" ]; then
+			break
+		fi
+		sleep 2
+	done
+	rm -f "$rule_lock" "$sub_lock"
 	$APP_FILE stop
 	$APP_FILE start $1
 	unset_lock
diff --git a/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh b/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh
index 028484f90..79376d694 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/haproxy_check.sh
@@ -8,7 +8,7 @@ listen_port=$2
 server_address=$3
 server_port=$4
 
-pgrep -af "${CONFIG}/" | awk '/app\.sh.*(start|stop)/ || /nftables\.sh/ || /iptables\.sh/ { found = 1 } END { exit !found }' && {
+pgrep -af "${CONFIG}/" | grep -E 'app\.sh.*(start|stop)|nftables\.sh|iptables\.sh|subscribe\.lua' >/dev/null && {
 	exit 0
 }
 
diff --git a/luci-app-passwall2/root/usr/share/passwall2/iptables.sh b/luci-app-passwall2/root/usr/share/passwall2/iptables.sh
index 731dcc575..160318a06 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/iptables.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/iptables.sh
@@ -649,13 +649,9 @@ add_firewall_rule() {
 	ipset -! create $IPSET_LAN6 nethash family inet6 maxelem 1048576
 	ipset -! create $IPSET_VPS6 nethash family inet6 maxelem 1048576
 	ipset -! create $IPSET_WAN6 nethash family inet6 maxelem 1048576
-	
-	ipset -! -R <<-EOF
-		$(ip address show | grep -w "inet" | awk '{print $2}' | awk -F '/' '{print $1}' | sed -e "s/^/add $IPSET_LOCAL /")
-	EOF
-	ipset -! -R <<-EOF
-		$(ip address show | grep -w "inet6" | awk '{print $2}' | awk -F '/' '{print $1}' | sed -e "s/^/add $IPSET_LOCAL6 /")
-	EOF
+
+	get_local_ips ip4 | sed "s/^/add $IPSET_LOCAL /" | ipset -! -R
+	get_local_ips ip6 | sed "s/^/add $IPSET_LOCAL6 /" | ipset -! -R
 
 	ipset -! -R <<-EOF
 		$(gen_lanlist | sed -e "s/^/add $IPSET_LAN /")
@@ -749,9 +745,9 @@ add_firewall_rule() {
 	$ipt_n -N PSW2_DNS
 	if [ $(config_t_get global dns_redirect "1") = "0" ]; then
 		#Only hijack when dest address is local IP
-		$ipt_n -I PREROUTING $(dst $IPSET_LOCAL) -j PSW2_DNS
+		$ipt_n -I PREROUTING -m set --match-set $IPSET_LAN src $(dst $IPSET_LOCAL) -j PSW2_DNS
 	else
-		$ipt_n -I PREROUTING -j PSW2_DNS
+		$ipt_n -I PREROUTING -m set --match-set $IPSET_LAN src -j PSW2_DNS
 	fi
 
 	$ipt_m -N PSW2_DIVERT
@@ -799,9 +795,9 @@ add_firewall_rule() {
 	$ip6t_n -N PSW2_DNS
 	if [ $(config_t_get global dns_redirect "1") = "0" ]; then
 		#Only hijack when dest address is local IP
-		$ip6t_n -I PREROUTING $(dst $IPSET_LOCAL6) -j PSW2_DNS
+		$ip6t_n -I PREROUTING -m set --match-set $IPSET_LAN6 src $(dst $IPSET_LOCAL6) -j PSW2_DNS
 	else
-		$ip6t_n -I PREROUTING -j PSW2_DNS
+		$ip6t_n -I PREROUTING -m set --match-set $IPSET_LAN6 src -j PSW2_DNS
 	fi
 
 	$ip6t_m -N PSW2_DIVERT
diff --git a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
index 3411cea60..f0a11ce13 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/nftables.sh
@@ -712,8 +712,8 @@ add_firewall_rule() {
 	gen_nftset $NFTSET_VPS6 ipv6_addr 0 "-1"
 	gen_nftset $NFTSET_WAN6 ipv6_addr 0 "-1"
 
-	ip address show | grep -w "inet" | awk '{print $2}' | awk -F '/' '{print $1}' | insert_nftset $NFTSET_LOCAL "-1"
-	ip address show | grep -w "inet6" | awk '{print $2}' | awk -F '/' '{print $1}' | insert_nftset $NFTSET_LOCAL6 "-1"
+	get_local_ips ip4 | insert_nftset $NFTSET_LOCAL "-1"
+	get_local_ips ip6 | insert_nftset $NFTSET_LOCAL6 "-1"
 
 	# Ignore special IP ranges
 	local lan_ifname lan_ip
@@ -786,10 +786,11 @@ add_firewall_rule() {
 	nft "flush chain $NFTABLE_NAME PSW2_DNS"
 	if [ $(config_t_get global dns_redirect "1") = "0" ]; then
 		#Only hijack when dest address is local IP
-		nft "insert rule $NFTABLE_NAME dstnat ip daddr @${NFTSET_LOCAL} jump PSW2_DNS"
-		nft "insert rule $NFTABLE_NAME dstnat ip6 daddr @${NFTSET_LOCAL6} jump PSW2_DNS"
+		nft "insert rule $NFTABLE_NAME dstnat ip saddr @${NFTSET_LAN} ip daddr @${NFTSET_LOCAL} jump PSW2_DNS"
+		nft "insert rule $NFTABLE_NAME dstnat ip6 saddr @${NFTSET_LAN6} ip6 daddr @${NFTSET_LOCAL6} jump PSW2_DNS"
 	else
-		nft "insert rule $NFTABLE_NAME dstnat jump PSW2_DNS"
+		nft "insert rule $NFTABLE_NAME dstnat ip saddr @${NFTSET_LAN} jump PSW2_DNS"
+		nft "insert rule $NFTABLE_NAME dstnat ip6 saddr @${NFTSET_LAN6} jump PSW2_DNS"
 	fi
 
 	# for ipv4 ipv6 tproxy mark
diff --git a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
index c1aa50d42..18cb53bb6 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
@@ -184,6 +184,34 @@ if geoip_update == "0" and geosite_update == "0" then
 	os.exit(0)
 end
 
+local function check_instance(action)
+	local rule_lock = "/var/lock/" .. name .. "_rule_update.lock"
+	local sub_lock = "/var/lock/" .. name .. "_subscribe.lock"
+
+	if action == "start" then
+		math.randomseed(os.time() + math.floor(os.clock() * 1000))
+		api.nixio.nanosleep(0, math.random(100, 1000) * 1000000)
+		if fs.access(rule_lock) then
+			log(0, api.i18n.translatef("[Rule update] instance is running; please try again later.") .. "\n")
+			os.exit(0)
+		else
+			luci.sys.call("touch " .. rule_lock)
+		end
+	elseif action == "end" then
+		luci.sys.call("rm -f " .. rule_lock)
+		return
+	end
+
+	if fs.access(sub_lock) then
+		log(0, api.i18n.translatef("[Subscription] instance is running; [Rule Update] queue and wait.") .. "\n")
+	end
+	while fs.access(sub_lock) do
+		api.nixio.nanosleep(2, 0)
+	end
+end
+
+check_instance("start")
+
 log(0, api.i18n.translate("Start updating the rules..."))
 local function safe_call(func, err_msg)
 	xpcall(func, function(e)
@@ -221,3 +249,5 @@ if reboot == 1 then
 	api.uci_save(uci, name, true, true)
 end
 log(0, api.i18n.translate("The rules have been updated..."))
+
+check_instance("end")
diff --git a/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh b/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh
index 434d96066..b009002b5 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/socks_auto_switch.sh
@@ -5,6 +5,12 @@ APP_FILE=${APP_PATH}/app.sh
 
 flag=0
 
+check_process() {
+	while pgrep -af "${CONFIG}/" | grep -E 'app\.sh.*(start|stop)|nftables\.sh|iptables\.sh|subscribe\.lua' >/dev/null; do
+		sleep 6s
+	done
+}
+
 test_url() {
 	local url=$1
 	local try=1
@@ -48,6 +54,7 @@ test_node() {
 	local node_id=$1
 	local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
 	[ -n "${_type}" ] && {
+		check_process
 		local _tmp_port=$(get_new_port 48800 tcp,udp)
 		NO_REC_PROCESS=1 $APP_FILE run_socks flag="test_node_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=test_node_${node_id}.json
 		sleep 2s
@@ -92,6 +99,7 @@ test_auto_switch() {
 	if [ "$restore_switch" = "1" ] && [ -n "$main_node" ] && [ "$now_node" != "$main_node" ]; then
 		test_node ${main_node}
 		[ $? -eq 0 ] && {
+			check_process
 			# The main node is working properly; switch to the main node.
 			log_i18n 0 "Socks switch detection: Primary node 【%s: [%s]】 is normal. Switch to the primary node!" "${id}" "$(config_n_get $main_node type)" "$(config_n_get $main_node remarks)"
 			$APP_FILE socks_node_switch flag=${id} new_node=${main_node}
@@ -135,6 +143,7 @@ test_auto_switch() {
 #				[ -z "$(echo $b_nodes | grep $main_node)" ] && uci add_list $CONFIG.${id}.autoswitch_backup_node=$main_node
 #				uci commit $CONFIG
 #			}
+			check_process
 			log_i18n 0 "Socks switch detection: %s 【%s:[%s]】 normal, switch to this node!" "${id}" "$(config_n_get $new_node type)" "$(config_n_get $new_node remarks)"
 			$APP_FILE socks_node_switch flag=${id} new_node=${new_node}
 			[ $? -eq 0 ] && {
@@ -172,10 +181,7 @@ start() {
 			sleep 6s
 			continue
 		}
-		pgrep -af "${CONFIG}/" | awk '/app\.sh.*(start|stop)/ || /nftables\.sh/ || /iptables\.sh/ { found = 1 } END { exit !found }' && {
-			sleep 6s
-			continue
-		}
+		check_process
 		touch $LOCK_FILE
 		test_auto_switch "$backup_node"
 		rm -f $LOCK_FILE
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index f8a7f5bf0..f02703f9f 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -23,7 +23,6 @@ local uci = api.uci
 local fs = api.fs
 local log = api.log
 local i18n = api.i18n
-uci:revert(appname)
 
 local has_ss = api.is_finded("ss-redir")
 local has_ss_rust = api.is_finded("sslocal")
@@ -301,7 +300,12 @@ do
 					currentNodes[#currentNodes + 1] = {
 						log = true,
 						node = node,
-						currentNode = node and uci:get_all(appname, node) or nil,
+						currentNode = (function()
+							if node and node:find("Socks_") then
+								return { Socks = node }
+							end
+							return node and uci:get_all(appname, node) or nil
+						end)(),
 						remarks = node,
 						set = function(o, server)
 							if o and server and server ~= "nil" then
@@ -325,7 +329,7 @@ do
 
 			-- Backup Node
 			local currentNode = uci:get_all(appname, node_id) or nil
-			if currentNode and currentNode.fallback_node then
+			if currentNode and currentNode.fallback_node and not currentNode.fallback_node:find("Socks_") then
 				CONFIG[#CONFIG + 1] = {
 					log = true,
 					id = node_id,
@@ -349,7 +353,12 @@ do
 					currentNodes[#currentNodes + 1] = {
 						log = true,
 						node = node,
-						currentNode = node and uci:get_all(appname, node) or nil,
+						currentNode = (function()
+							if node and node:find("Socks_") then
+								return { Socks = node }
+							end
+							return node and uci:get_all(appname, node) or nil
+						end)(),
 						remarks = node,
 						set = function(o, server)
 							if o and server and server ~= "nil" then
@@ -645,7 +654,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 		if info.tls == "tls" or info.tls == "1" then
 			result.tls = "1"
 			result.tls_serverName = (info.sni and info.sni ~= "") and info.sni or info.host
-			result.tls_CertSha = info.pcs
+			result.tls_pinSHA256 = info.pcs
 			result.tls_CertByName = info.vcn
 			local insecure = info.allowinsecure or info.allowInsecure or info.insecure
 			result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
@@ -915,7 +924,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 							result.ech = "1"
 							result.ech_config = params.ech
 						end
-						result.tls_CertSha = params.pcs
+						result.tls_pinSHA256 = params.pcs
 						result.tls_CertByName = params.vcn
 						if params.security == "reality" then
 							result.reality = "1"
@@ -1028,7 +1037,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 
 			result.tls = '1'
 			result.tls_serverName = params.peer or params.sni or ""
-			result.tls_CertSha = params.pcs
+			result.tls_pinSHA256 = params.pcs
 			result.tls_CertByName = params.vcn
 			local insecure = params.allowinsecure or params.allowInsecure or params.insecure
 			result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
@@ -1271,7 +1280,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 					result.ech = "1"
 					result.ech_config = params.ech
 				end
-				result.tls_CertSha = params.pcs
+				result.tls_pinSHA256 = params.pcs
 				result.tls_CertByName = params.vcn
 				if params.security == "reality" then
 					result.reality = "1"
@@ -1382,11 +1391,10 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 			result.address = host_port
 		end
 		result.tls_serverName = params.sni
-		result.tls_CertSha = params.pcs
+		result.tls_pinSHA256 = params.pcs or params.pinsha256
 		result.tls_CertByName = params.vcn
 		local insecure = params.allowinsecure or params.insecure
 		result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
-		result.hysteria2_tls_pinSHA256 = params.pinSHA256
 		result.hysteria2_hop = params.mport
 
 		if (sub_hysteria2_type == "sing-box" and has_singbox) or (sub_hysteria2_type == "xray" and has_xray) then
@@ -1608,9 +1616,9 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 end
 
 local function curl(url, file, ua, mode)
-	if not url or url == "" then return 404 end
+	if not url or url == "" then return 22, 404 end
 	local curl_args = {
-		"-skL", "-w %{http_code}", "--retry 3", "--connect-timeout 3", "-H 'Accept-Encoding: identity'"
+		"-fskL", "-w %{http_code}", "--retry 3", "--connect-timeout 3", "-H 'Accept-Encoding: identity'"
 	}
 	if ua and ua ~= "" and ua ~= "curl" then
 		ua = (ua == "passwall2") and ("passwall2/" .. api.get_version()) or ua
@@ -1625,7 +1633,7 @@ local function curl(url, file, ua, mode)
 	else
 		return_code, result = api.curl_auto(url, file, curl_args)
 	end
-	return tonumber(result)
+	return return_code, tonumber(result)
 end
 
 function get_headers()
@@ -1733,6 +1741,10 @@ local function select_node(nodes, config, parentConfig)
 	end
 	if config.currentNode then
 		local server
+		-- Load balancing, keeping the original ID of the Socks [port] node in urltest.
+		if config.currentNode["Socks"] then
+			server = config.currentNode.Socks
+		end
 		-- Special priority: cfgid
 		if config.currentNode[".name"] then
 			for index, node in pairs(nodes) do
@@ -1945,7 +1957,6 @@ local function update_node(manual)
 			end
 		end
 	end
-	api.uci_save(uci, appname, true)
 
 	if next(CONFIG) then
 		local nodes = {}
@@ -1969,10 +1980,10 @@ local function update_node(manual)
 				select_node(nodes, config)
 			end
 		end
-
-		api.uci_save(uci, appname, true)
 	end
 
+	api.uci_save(uci, appname, true)
+
 	if arg[3] == "cron" then
 		if not fs.access("/var/lock/" .. appname .. ".lock") then
 			luci.sys.call("touch /tmp/lock/" .. appname .. "_cron.lock")
@@ -2111,8 +2122,9 @@ local execute = function()
 				local result = (not access_mode) and i18n.translatef("Auto") or (access_mode == "direct" and i18n.translatef("Direct") or (access_mode == "proxy" and i18n.translatef("Proxy") or i18n.translatef("Auto")))
 				log(1, i18n.translatef("Start subscribing: %s", '【' .. remark .. '】' .. url .. ' [' .. result .. ']'))
 				tmp_file = "/tmp/" .. cfgid
-				value.http_code = curl(url, tmp_file, ua, access_mode)
-				if value.http_code ~= 200 then
+				local return_code
+				return_code, value.http_code = curl(url, tmp_file, ua, access_mode)
+				if return_code ~= 0 then
 					fail_list[#fail_list + 1] = value
 					luci.sys.call("rm -f " .. tmp_file)
 				end
@@ -2151,7 +2163,36 @@ local execute = function()
 	end
 end
 
+local function check_instance(action)
+	local sub_lock = "/var/lock/" .. appname .. "_subscribe.lock"
+	local rule_lock = "/var/lock/" .. appname .. "_rule_update.lock"
+
+	if action == "start" then
+		math.randomseed(os.time() + math.floor(os.clock() * 1000))
+		api.nixio.nanosleep(0, math.random(100, 1000) * 1000000)
+		if fs.access(sub_lock) then
+			log(0, i18n.translatef("[Subscription] instance is running; please try again later.") .. "\n")
+			os.exit(0)
+		else
+			luci.sys.call("touch " .. sub_lock)
+			uci:revert(appname)
+		end
+	elseif action == "end" then
+		luci.sys.call("rm -f " .. sub_lock)
+		return
+	end
+
+	if fs.access(rule_lock) then
+		log(0, i18n.translatef("[Rule Update] instance is running; [Subscription] queue and wait.") .. "\n")
+	end
+	while fs.access(rule_lock) do
+		api.nixio.nanosleep(2, 0)
+	end
+end
+
 if arg[1] then
+	check_instance("start")
+
 	if arg[1] == "start" then
 		log(0, i18n.translatef("Start subscribing..."))
 		xpcall(execute, function(e)
@@ -2170,4 +2211,6 @@ if arg[1] then
 	elseif arg[1] == "truncate" then
 		truncate_nodes(arg[2])
 	end
+
+	check_instance("end")
 end
diff --git a/luci-app-passwall2/root/usr/share/passwall2/utils.sh b/luci-app-passwall2/root/usr/share/passwall2/utils.sh
index 75762a7fc..0770d326a 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/utils.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/utils.sh
@@ -484,3 +484,33 @@ get_wan_ips() {
 	done
 	echo "$NET_ADDR"
 }
+
+get_local_ips() {
+	local family="$1"
+	local ALL_IPS WAN_IPS ip NET_ADDR
+	if [ "$family" = "ip6" ]; then
+		ALL_IPS=$(ip -o -6 addr show scope global | awk '{print $4}' | cut -d/ -f1)
+		WAN_IPS=$(get_wan_ips ip6)
+	else
+		ALL_IPS=$(ip -o -4 addr show scope global | awk '{print $4}' | cut -d/ -f1)
+		WAN_IPS=$(get_wan_ips ip4)
+	fi
+	# Supplementary loop (not included in scope global)
+	[ "$family" = "ip6" ] && ALL_IPS="$ALL_IPS ::1"
+	[ "$family" != "ip6" ] && ALL_IPS="$ALL_IPS 127.0.0.1"
+	for ip in $ALL_IPS; do
+		case "$ip" in
+			""|0.0.0.0|::) continue ;;
+		esac
+		case " $WAN_IPS " in
+			*" $ip "*) continue ;;
+		esac
+		case " $NET_ADDR " in
+			*" $ip "*) ;;
+			*) NET_ADDR="${NET_ADDR:+$NET_ADDR }$ip" ;;
+		esac
+	done
+	for ip in $NET_ADDR; do
+		echo "$ip"
+	done
+}
diff --git a/mosdns/Makefile b/mosdns/Makefile
index 6d21b80cd..28739afe1 100644
--- a/mosdns/Makefile
+++ b/mosdns/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosdns
 PKG_VERSION:=5.3.4
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)?
diff --git a/mosdns/patches/207-add-adblock_set-database-plugin.patch b/mosdns/patches/207-add-adblock_set-database-plugin.patch
new file mode 100644
index 000000000..1f1f8e518
--- /dev/null
+++ b/mosdns/patches/207-add-adblock_set-database-plugin.patch
@@ -0,0 +1,427 @@
+From 64614017e674960638bac87b4a2f9c0aea0065e6 Mon Sep 17 00:00:00 2001
+From: sbwml <admin@cooluc.com>
+Date: Fri, 1 May 2026 01:35:59 +0800
+Subject: [PATCH] add adblock_set database plugin
+
+Signed-off-by: sbwml <admin@cooluc.com>
+---
+ .../data_provider/adblock_set/adblock_set.go  | 122 ++++++++++++++++++
+ .../adblock_set/adblock_set_test.go           | 107 +++++++++++++++
+ plugin/data_provider/adblock_set/matcher.go   |  43 ++++++
+ plugin/data_provider/adblock_set/parser.go    | 115 +++++++++++++++++
+ plugin/enabled_plugins.go                     |   1 +
+ 5 files changed, 388 insertions(+)
+ create mode 100644 plugin/data_provider/adblock_set/adblock_set.go
+ create mode 100644 plugin/data_provider/adblock_set/adblock_set_test.go
+ create mode 100644 plugin/data_provider/adblock_set/matcher.go
+ create mode 100644 plugin/data_provider/adblock_set/parser.go
+
+--- /dev/null
++++ b/plugin/data_provider/adblock_set/adblock_set.go
+@@ -0,0 +1,122 @@
++/*
++ * Copyright (C) 2025, IrineSistiana
++ *
++ * This file is part of mosdns.
++ *
++ * mosdns is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * mosdns is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ */
++
++package adblock_set
++
++import (
++	"fmt"
++	"os"
++	"sync/atomic"
++	"time"
++
++	"github.com/IrineSistiana/mosdns/v5/coremain"
++	"github.com/IrineSistiana/mosdns/v5/pkg/matcher/domain"
++	"github.com/IrineSistiana/mosdns/v5/pkg/utils"
++	"github.com/IrineSistiana/mosdns/v5/plugin/data_provider"
++	"go.uber.org/zap"
++)
++
++const PluginType = "adblock_set"
++
++func init() {
++	coremain.RegNewPluginFunc(PluginType, Init, func() any { return new(Args) })
++}
++
++func Init(bp *coremain.BP, args any) (any, error) {
++	m, err := NewAdblockSet(bp, args.(*Args))
++	if err != nil {
++		return nil, err
++	}
++	return m, nil
++}
++
++type Args struct {
++	Files []string `yaml:"files"`
++}
++
++var _ data_provider.DomainMatcherProvider = (*AdblockSet)(nil)
++
++type AdblockSet struct {
++	matcher atomic.Pointer[AdblockMatcher]
++	fw      *utils.FileWatcher
++}
++
++func (d *AdblockSet) GetDomainMatcher() domain.Matcher[struct{}] {
++	return d
++}
++
++func (d *AdblockSet) Match(s string) (struct{}, bool) {
++	if m := d.matcher.Load(); m != nil {
++		return m.Match(s)
++	}
++	return struct{}{}, false
++}
++
++func (d *AdblockSet) Close() error {
++	if d.fw != nil {
++		return d.fw.Close()
++	}
++	return nil
++}
++
++func NewAdblockSet(bp *coremain.BP, args *Args) (*AdblockSet, error) {
++	ds := &AdblockSet{}
++
++	loadInner := func() (*AdblockMatcher, error) {
++		m := &AdblockMatcher{
++			blacklist: domain.NewMixMatcher[struct{}](),
++			whitelist: domain.NewMixMatcher[struct{}](),
++		}
++		for _, f := range args.Files {
++			if len(f) == 0 {
++				continue
++			}
++			file, err := os.Open(f)
++			if err != nil {
++				return nil, fmt.Errorf("failed to open file %s: %w", f, err)
++			}
++			if err := ParseRules(file, m.blacklist, m.whitelist); err != nil {
++				file.Close()
++				return nil, fmt.Errorf("failed to parse rules from %s: %w", f, err)
++			}
++			file.Close()
++		}
++		return m, nil
++	}
++
++	m, err := loadInner()
++	if err != nil {
++		return nil, err
++	}
++	ds.matcher.Store(m)
++
++	if len(args.Files) > 0 {
++		ds.fw = utils.StartFileWatcher(args.Files, time.Second*3, func(changedFiles []string) {
++			newM, err := loadInner()
++			if err == nil {
++				ds.matcher.Store(newM)
++				bp.L().Info("reloaded adblock files", zap.Strings("files", changedFiles))
++			} else {
++				bp.L().Error("failed to reload adblock files", zap.Error(err))
++			}
++		})
++	}
++
++	return ds, nil
++}
+--- /dev/null
++++ b/plugin/data_provider/adblock_set/adblock_set_test.go
+@@ -0,0 +1,107 @@
++/*
++ * Copyright (C) 2025, IrineSistiana
++ *
++ * This file is part of mosdns.
++ *
++ * mosdns is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * mosdns is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ */
++
++package adblock_set
++
++import (
++	"strings"
++	"testing"
++
++	"github.com/IrineSistiana/mosdns/v5/pkg/matcher/domain"
++	"github.com/stretchr/testify/assert"
++)
++
++func TestParseAndMatch(t *testing.T) {
++	rules := `
++! Comment
++# Another comment
++||example.com^
++@@||whitelist.com^
++|exact.com|
++@@|white-exact.com|
++/.*regex.*/
++@@/.*white-regex.*/
++*keyword*
++@@*white-keyword*
++blocked.com
++domain:ntp.org
++full:metrics.icloud.com
++`
++	blacklist := domain.NewMixMatcher[struct{}]()
++	whitelist := domain.NewMixMatcher[struct{}]()
++
++	err := ParseRules(strings.NewReader(rules), blacklist, whitelist)
++	assert.NoError(t, err)
++
++	matcher := &AdblockMatcher{
++		blacklist: blacklist,
++		whitelist: whitelist,
++	}
++
++	tests := []struct {
++		domain string
++		want   bool
++	}{
++		{"example.com", true},
++		{"sub.example.com", true},
++		{"whitelist.com", false},
++		{"sub.whitelist.com", false},
++		{"exact.com", true},
++		{"sub.exact.com", false}, // |exact.com| is exact match
++		{"white-exact.com", false},
++		{"myregex123", true},
++		{"mywhite-regex123", false},
++		{"somekeywordhere", true},
++		{"some-white-keyword-here", false},
++		{"blocked.com", true},
++		{"other.com", false},
++		{"ntp.org", true},       // matched by domain:ntp.org
++		{"sub.ntp.org", true},   // matched by domain:ntp.org
++		{"metrics.icloud.com", true}, // matched by full:metrics.icloud.com
++		{"sub.metrics.icloud.com", false}, // full match only
++	}
++
++	for _, tt := range tests {
++		_, ok := matcher.Match(tt.domain)
++		assert.Equal(t, tt.want, ok, "Match(%s)", tt.domain)
++	}
++}
++
++func TestStripOptions(t *testing.T) {
++	rules := `
++||example.com^$important,third-party
++@@||whitelist.com^$dnstype=A
++`
++	blacklist := domain.NewMixMatcher[struct{}]()
++	whitelist := domain.NewMixMatcher[struct{}]()
++
++	err := ParseRules(strings.NewReader(rules), blacklist, whitelist)
++	assert.NoError(t, err)
++
++	matcher := &AdblockMatcher{
++		blacklist: blacklist,
++		whitelist: whitelist,
++	}
++
++	_, ok := matcher.Match("example.com")
++	assert.True(t, ok)
++
++	_, ok = matcher.Match("whitelist.com")
++	assert.False(t, ok)
++}
+--- /dev/null
++++ b/plugin/data_provider/adblock_set/matcher.go
+@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2025, IrineSistiana
++ *
++ * This file is part of mosdns.
++ *
++ * mosdns is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * mosdns is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ */
++
++package adblock_set
++
++import (
++	"github.com/IrineSistiana/mosdns/v5/pkg/matcher/domain"
++)
++
++type AdblockMatcher struct {
++	blacklist *domain.MixMatcher[struct{}]
++	whitelist *domain.MixMatcher[struct{}]
++}
++
++func (m *AdblockMatcher) Match(s string) (struct{}, bool) {
++	// 1. Check whitelist. If matched, it's NOT a hit for the adblock set.
++	if _, ok := m.whitelist.Match(s); ok {
++		return struct{}{}, false
++	}
++
++	// 2. Check blacklist.
++	if _, ok := m.blacklist.Match(s); ok {
++		return struct{}{}, true
++	}
++
++	return struct{}{}, false
++}
+--- /dev/null
++++ b/plugin/data_provider/adblock_set/parser.go
+@@ -0,0 +1,115 @@
++/*
++ * Copyright (C) 2025, IrineSistiana
++ *
++ * This file is part of mosdns.
++ *
++ * mosdns is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * mosdns is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
++ */
++
++package adblock_set
++
++import (
++	"bufio"
++	"io"
++	"strings"
++
++	"github.com/IrineSistiana/mosdns/v5/pkg/matcher/domain"
++)
++
++// ParseRules reads AdBlock rules from r and adds them to blacklist and whitelist matchers.
++func ParseRules(r io.Reader, blacklist, whitelist *domain.MixMatcher[struct{}]) error {
++	scanner := bufio.NewScanner(r)
++	for scanner.Scan() {
++		line := strings.TrimSpace(scanner.Text())
++		if line == "" || line[0] == '!' || line[0] == '#' {
++			continue
++		}
++
++		// Handle whitelists
++		isWhitelist := false
++		if strings.HasPrefix(line, "@@") {
++			isWhitelist = true
++			line = line[2:]
++		}
++
++		// Handle comments in rules (e.g., rule # comment)
++		// But in AdBlock, # is usually for element hiding (##) or CSS selectors.
++		// For DNS rules, we ignore anything starting with #.
++		if strings.Contains(line, "##") || strings.Contains(line, "#?#") || strings.Contains(line, "#$#") {
++			continue
++		}
++
++		// Strip options (e.g., $important, $third-party)
++		if idx := strings.LastIndex(line, "$"); idx != -1 {
++			// Check if it's a regex or something else. 
++			// In ABP, $ marks the start of options.
++			line = line[:idx]
++		}
++
++		if line == "" {
++			continue
++		}
++
++		target := blacklist
++		if isWhitelist {
++			target = whitelist
++		}
++
++		if err := parseAndAddRule(line, target); err != nil {
++			// Skip invalid rules but maybe we should log them?
++			continue
++		}
++	}
++	return scanner.Err()
++}
++
++func parseAndAddRule(rule string, m *domain.MixMatcher[struct{}]) error {
++	// 0. Native MosDNS rules: type:pattern
++	if strings.Contains(rule, ":") {
++		typ, _, _ := strings.Cut(rule, ":")
++		switch typ {
++		case "full", "domain", "regexp", "keyword":
++			return m.Add(rule, struct{}{})
++		}
++	}
++
++	// 1. Regex: /regexp/
++	if strings.HasPrefix(rule, "/") && strings.HasSuffix(rule, "/") && len(rule) > 2 {
++		return m.Add("regexp:"+rule[1:len(rule)-1], struct{}{})
++	}
++
++	// 2. Subdomain: ||example.com^
++	if strings.HasPrefix(rule, "||") {
++		domainStr := rule[2:]
++		if strings.HasSuffix(domainStr, "^") {
++			domainStr = domainStr[:len(domainStr)-1]
++		}
++		return m.Add("domain:"+domainStr, struct{}{})
++	}
++
++	// 3. Exact match: |example.com|
++	if strings.HasPrefix(rule, "|") && strings.HasSuffix(rule, "|") && len(rule) > 2 {
++		return m.Add("full:"+rule[1:len(rule)-1], struct{}{})
++	}
++
++	// 4. Keyword: *keyword*
++	if strings.HasPrefix(rule, "*") && strings.HasSuffix(rule, "*") && len(rule) > 2 {
++		return m.Add("keyword:"+rule[1:len(rule)-1], struct{}{})
++	}
++
++	// 5. Default: treat as exact match if it looks like a domain
++	// Many lists are just a list of domains.
++	// AdGuard Home treats rules without || or ^ as exact matches.
++	return m.Add("full:"+rule, struct{}{})
++}
+--- a/plugin/enabled_plugins.go
++++ b/plugin/enabled_plugins.go
+@@ -22,6 +22,7 @@ package plugin
+ // data providers
+ import (
+ 	// data provider
++	_ "github.com/IrineSistiana/mosdns/v5/plugin/data_provider/adblock_set"
+ 	_ "github.com/IrineSistiana/mosdns/v5/plugin/data_provider/domain_set"
+ 	_ "github.com/IrineSistiana/mosdns/v5/plugin/data_provider/ip_set"
+