luci-app-adblock-fast: sync with principal package
* add support for smartdns ipset/nftset-based blocking Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
parent
576fd044b9
commit
4c3cdcb68e
4 changed files with 145 additions and 101 deletions
|
|
@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
PKG_VERSION:=1.1.0-1
|
||||
PKG_VERSION:=1.1.0-3
|
||||
|
||||
LUCI_TITLE:=AdBlock-Fast Web UI
|
||||
LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service.
|
||||
|
|
|
|||
|
|
@ -38,9 +38,12 @@ return view.extend({
|
|||
ipset_installed: false,
|
||||
nft_installed: false,
|
||||
dnsmasq_installed: false,
|
||||
unbound_installed: false,
|
||||
dnsmasq_ipset_support: false,
|
||||
dnsmasq_nftset_support: false,
|
||||
smartdns_installed: false,
|
||||
smartdns_ipset_support: false,
|
||||
smartdns_nftset_support: false,
|
||||
unbound_installed: false,
|
||||
leds: [],
|
||||
},
|
||||
};
|
||||
|
|
@ -102,6 +105,21 @@ return view.extend({
|
|||
_("Please note that %s is not supported on this system.").format(
|
||||
"<i>smartdns.domainset</i>"
|
||||
);
|
||||
} else {
|
||||
if (!reply.platform.smartdns_ipset_support) {
|
||||
text +=
|
||||
"<br />" +
|
||||
_("Please note that %s is not supported on this system.").format(
|
||||
"<i>smartdns.ipset</i>"
|
||||
);
|
||||
}
|
||||
if (!reply.platform.smartdns_nftset_support) {
|
||||
text +=
|
||||
"<br />" +
|
||||
_("Please note that %s is not supported on this system.").format(
|
||||
"<i>smartdns.nftset</i>"
|
||||
);
|
||||
}
|
||||
}
|
||||
if (!reply.platform.unbound_installed) {
|
||||
text =
|
||||
|
|
@ -132,6 +150,12 @@ return view.extend({
|
|||
}
|
||||
if (reply.platform.smartdns_installed) {
|
||||
o.value("smartdns.domainset", _("smartdns domain set"));
|
||||
if (reply.platform.smartdns_ipset_support) {
|
||||
o.value("smartdns.ipset", _("smartdns ipset"));
|
||||
}
|
||||
if (reply.platform.smartdns_nftset_support) {
|
||||
o.value("smartdns.nftset", _("smartdns nft set"));
|
||||
}
|
||||
}
|
||||
if (reply.platform.unbound_installed) {
|
||||
o.value("unbound.adb_list", _("unbound adblock list"));
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ msgstr ""
|
|||
msgid "-"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:427
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:451
|
||||
msgid "Action"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -31,13 +31,13 @@ msgstr ""
|
|||
msgid "AdBlock Fast"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:181
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:215
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:205
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:239
|
||||
msgid "AdBlock on %s only"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:167
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:201
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:191
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:225
|
||||
msgid "AdBlock on all instances"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -45,15 +45,15 @@ msgstr ""
|
|||
msgid "AdBlock-Fast"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:378
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:402
|
||||
msgid "AdBlock-Fast - Allowed and Blocked Domains"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:402
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:426
|
||||
msgid "AdBlock-Fast - Allowed and Blocked Lists URLs"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:50
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:53
|
||||
msgid "AdBlock-Fast - Configuration"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -61,46 +61,46 @@ msgstr ""
|
|||
msgid "AdBlock-Fast - Status"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:280
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:304
|
||||
msgid "Add IPv6 entries"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:277
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:301
|
||||
msgid "Add IPv6 entries to block-list."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:53
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:56
|
||||
msgid "Advanced Configuration"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:428
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:433
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:452
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:457
|
||||
msgid "Allow"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:386
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:410
|
||||
msgid "Allowed Domains"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:341
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:365
|
||||
msgid ""
|
||||
"Attempt to create a compressed cache of block-list in the persistent memory."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:265
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:289
|
||||
msgid "Automatic Config Update"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:52
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:55
|
||||
msgid "Basic Configuration"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:429
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:433
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:453
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:457
|
||||
msgid "Block"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:394
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:418
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:87
|
||||
msgid "Blocked Domains"
|
||||
msgstr ""
|
||||
|
|
@ -141,42 +141,42 @@ msgstr ""
|
|||
msgid "Config (%s) validation failure!"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:238
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:262
|
||||
msgid "Controls system log and console output verbosity."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:314
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:338
|
||||
msgid "Curl download retry"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:301
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:325
|
||||
msgid "Curl maximum file size (in bytes)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:119
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:137
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:86
|
||||
msgid "DNS Service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:56
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:59
|
||||
msgid "DNS resolution option, see the %sREADME%s for details."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:352
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:376
|
||||
msgid "Directory for compressed cache file"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:354
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:378
|
||||
msgid ""
|
||||
"Directory for compressed cache file of block-list in the persistent memory."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:424
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:268
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:292
|
||||
msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:370
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:394
|
||||
msgid "Disable Debugging"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -188,23 +188,23 @@ msgstr ""
|
|||
msgid "Disabling %s service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:145
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:169
|
||||
msgid "Dnsmasq Config File URL"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:279
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:303
|
||||
msgid "Do not add IPv6 entries"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:344
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:368
|
||||
msgid "Do not store compressed cache"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:331
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:355
|
||||
msgid "Do not use simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:291
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:315
|
||||
msgid "Download time-out (in seconds)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -214,17 +214,17 @@ msgid "Downloading lists"
|
|||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:405
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:269
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:423
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:293
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:447
|
||||
msgid "Enable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:367
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:371
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:391
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:395
|
||||
msgid "Enable Debugging"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:368
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:392
|
||||
msgid "Enables debug output to /tmp/adblock-fast.log."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -349,11 +349,11 @@ msgstr ""
|
|||
msgid "Force Reloading"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:226
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:250
|
||||
msgid "Force Router DNS"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:230
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:254
|
||||
msgid "Force Router DNS server to all local devices"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -361,7 +361,7 @@ msgstr ""
|
|||
msgid "Force redownloading %s block lists"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:227
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:251
|
||||
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -373,27 +373,27 @@ msgstr ""
|
|||
msgid "Grant UCI and file access for luci-app-adblock-fast"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:276
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:300
|
||||
msgid "IPv6 Support"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:303
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:327
|
||||
msgid ""
|
||||
"If curl is installed and detected, it would not download files bigger than "
|
||||
"this."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:316
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:340
|
||||
msgid ""
|
||||
"If curl is installed and detected, it would retry download this many times "
|
||||
"on timeout/fail."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:387
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:411
|
||||
msgid "Individual domains to be allowed."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:395
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:419
|
||||
msgid "Individual domains to be blocked."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -401,25 +401,25 @@ msgstr ""
|
|||
msgid "Invalid compressed cache directory '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:250
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:274
|
||||
msgid "LED to indicate status"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:328
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:352
|
||||
msgid ""
|
||||
"Launch all lists downloads and processing simultaneously, reducing service "
|
||||
"start time."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:229
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:253
|
||||
msgid "Let local devices use their own DNS servers if set"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:217
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:241
|
||||
msgid "No AdBlock on SmartDNS"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:183
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:207
|
||||
msgid "No AdBlock on dnsmasq"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -435,7 +435,7 @@ msgstr ""
|
|||
msgid "Not installed or not found"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:237
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:261
|
||||
msgid "Output Verbosity Setting"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -447,22 +447,24 @@ msgstr ""
|
|||
msgid "Pausing %s"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:266
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:290
|
||||
msgid "Perform config update before downloading the block/allow-lists."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:252
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:276
|
||||
msgid "Pick the LED not already used in %sSystem LED Configuration%s."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:64
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:69
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:74
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:79
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:86
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:93
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:102
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:110
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:67
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:72
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:77
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:82
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:89
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:96
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:105
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:112
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:119
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:128
|
||||
msgid "Please note that %s is not supported on this system."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -496,19 +498,19 @@ msgstr ""
|
|||
msgid "Service Warnings"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:326
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:350
|
||||
msgid "Simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:410
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:434
|
||||
msgid "Size"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:420
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:444
|
||||
msgid "Size: %s"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:241
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:265
|
||||
msgid "Some output"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -537,7 +539,7 @@ msgstr ""
|
|||
msgid "Stop"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:292
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:316
|
||||
msgid "Stop the download if it is stalled for set number of seconds."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -550,15 +552,15 @@ msgstr ""
|
|||
msgid "Stopping %s service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:345
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:369
|
||||
msgid "Store compressed cache"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:339
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:363
|
||||
msgid "Store compressed cache file on router"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:240
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:264
|
||||
msgid "Suppress output"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -588,29 +590,29 @@ msgstr ""
|
|||
msgid "The dnsmasq nft sets support is enabled, but nft is not installed"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:436
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:460
|
||||
msgid "URL"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:147
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:171
|
||||
msgid ""
|
||||
"URL to the external dnsmasq config file, see the %sREADME%s for details."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:403
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:427
|
||||
msgid "URLs to file(s) containing lists to be allowed or blocked."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:414
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:438
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:95
|
||||
msgid "Unknown"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:193
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:217
|
||||
msgid "Use AdBlocking on the SmartDNS instance(s)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:159
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:183
|
||||
msgid "Use AdBlocking on the dnsmasq instance(s)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -619,11 +621,11 @@ msgid ""
|
|||
"Use of external dnsmasq config file detected, please set '%s' option to '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:332
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:356
|
||||
msgid "Use simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:242
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:266
|
||||
msgid "Verbose output"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -639,46 +641,54 @@ msgstr ""
|
|||
msgid "Warning"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:195
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:219
|
||||
msgid ""
|
||||
"You can limit the AdBlocking to a specific SmartDNS instance(s) (%smore "
|
||||
"information%s)."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:161
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:185
|
||||
msgid ""
|
||||
"You can limit the AdBlocking to a specific dnsmasq instance(s) (%smore "
|
||||
"information%s)."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:123
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:141
|
||||
msgid "dnsmasq additional hosts"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:124
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:142
|
||||
msgid "dnsmasq config"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:126
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:144
|
||||
msgid "dnsmasq ipset"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:129
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:147
|
||||
msgid "dnsmasq nft set"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:131
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:149
|
||||
msgid "dnsmasq servers file"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:255
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:279
|
||||
msgid "none"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:134
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:152
|
||||
msgid "smartdns domain set"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:137
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:154
|
||||
msgid "smartdns ipset"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:157
|
||||
msgid "smartdns nft set"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:161
|
||||
msgid "unbound adblock list"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -251,16 +251,6 @@ get_platform_support() {
|
|||
else
|
||||
json_add_boolean 'dnsmasq_installed' '0'
|
||||
fi
|
||||
if check_smartdns; then
|
||||
json_add_boolean 'smartdns_installed' '1'
|
||||
else
|
||||
json_add_boolean 'smartdns_installed' '0'
|
||||
fi
|
||||
if check_unbound; then
|
||||
json_add_boolean 'unbound_installed' '1'
|
||||
else
|
||||
json_add_boolean 'unbound_installed' '0'
|
||||
fi
|
||||
if check_dnsmasq_ipset; then
|
||||
json_add_boolean 'dnsmasq_ipset_support' '1'
|
||||
else
|
||||
|
|
@ -271,6 +261,26 @@ get_platform_support() {
|
|||
else
|
||||
json_add_boolean 'dnsmasq_nftset_support' '0'
|
||||
fi
|
||||
if check_smartdns; then
|
||||
json_add_boolean 'smartdns_installed' '1'
|
||||
else
|
||||
json_add_boolean 'smartdns_installed' '0'
|
||||
fi
|
||||
if check_smartdns_ipset; then
|
||||
json_add_boolean 'smartdns_ipset_support' '1'
|
||||
else
|
||||
json_add_boolean 'smartdns_ipset_support' '0'
|
||||
fi
|
||||
if check_smartdns_nftset; then
|
||||
json_add_boolean 'smartdns_nftset_support' '1'
|
||||
else
|
||||
json_add_boolean 'smartdns_nftset_support' '0'
|
||||
fi
|
||||
if check_unbound; then
|
||||
json_add_boolean 'unbound_installed' '1'
|
||||
else
|
||||
json_add_boolean 'unbound_installed' '0'
|
||||
fi
|
||||
json_add_array 'leds'
|
||||
for i in /sys/class/leds/*; do json_add_string '' "$(basename "$i")"; done
|
||||
json_close_array
|
||||
|
|
|
|||
Loading…
Reference in a new issue