luci-app-adblock: sync with adblock-4.2.4-1

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 296ce160fcb8e6b0be02d968dce0db1ac5202119..34873c0714512d954533b18304bd715d3832e3d4 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Dirk Brenken (dev@brenken.org)
+# Copyright 2017-2025 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the Apache License, Version 2.0
 
 include $(TOPDIR)/rules.mk

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
index 1f657651bad2bf35bb2bc70e2231a6ea47d27a7b..9f5c6c4b060dc23113f169cd682a73687b9268cc 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
@@ -12,7 +12,7 @@ return view.extend({
                return fs.write('/etc/adblock/adblock.blacklist', value)
                        .then(function(rc) {
                                document.querySelector('textarea').value = value;
-                               ui.addNotification(null, E('p', _('Blacklist changes have been saved. Refresh your adblock lists that changes take effect.')), 'info');
+                               ui.addNotification(null, E('p', _('The changes to the blacklist have been saved. Reload your adblock lists for the changes to take effect.')), 'info');
                        }).catch(function(e) {
                                ui.addNotification(null, E('p', _('Unable to save changes: %s').format(e.message)));
                        });

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index e0df36f22522e87b23da006d3e655cdd971f9aa2..dd715ac4aef27157470d6e37fd365ddb540f2b21 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -421,6 +421,7 @@ return view.extend({
                o.value('dnsmasq', _('dnsmasq (/tmp/dnsmasq.d)'));
                o.value('unbound', _('unbound (/var/lib/unbound)'));
                o.value('named', _('bind (/var/lib/bind)'));
+               o.value('smartdns', _('smartdns (/tmp/smartdns)'));
                o.value('kresd', _('kresd (/etc/kresd)'));
                o.value('raw', _('raw (/tmp)'));
                o.optional = true;

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
index 31e58d3c744119d3e1fdef5a917dbe7b0ae79fe8..9ffdbbd763724c1fe932e648168bafe7370183c2 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
@@ -12,7 +12,7 @@ return view.extend({
                return fs.write('/etc/adblock/adblock.whitelist', value)
                        .then(function(rc) {
                                document.querySelector('textarea').value = value;
-                               ui.addNotification(null, E('p', _('Whitelist changes have been saved. Refresh your adblock lists that changes take effect.')), 'info');
+                               ui.addNotification(null, E('p', _('The changes to the whitelist have been saved. Reload your adblock lists for the changes to take effect.')), 'info');
                        }).catch(function(e) {
                                ui.addNotification(null, E('p', _('Unable to save changes: %s').format(e.message)));
                        });