From 4ee8da2eb19917a7436b8ea437b44ef055a565d8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 22 Feb 2025 07:06:29 +0100 Subject: [PATCH] luci-app-adblock: sync with release 4.2.6-1 Signed-off-by: Dirk Brenken --- .../resources/view/adblock/overview.js | 5 - .../luci-app-adblock/po/templates/adblock.pot | 128 +++++++++--------- 2 files changed, 66 insertions(+), 67 deletions(-) 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 6422aa2c2cda..9f0de8beb44e 100644 --- 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 @@ -525,11 +525,6 @@ return view.extend({ o.placeholder = 'adb_notify'; o.rmempty = true; - o = s.taboption('adv_email', form.Value, 'adb_mailcnt', _('E-Mail Notification Count'), _('Raise the notification count, to get E-Mails if the overall blocklist count is less or equal to the given limit.')); - o.placeholder = '0'; - o.datatype = 'min(0)'; - o.rmempty = true; - /* blocklist sources tab */ diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 8dd8dc2514b4..d3913802a0d8 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -33,7 +33,7 @@ msgstr "" msgid "Add this (sub-)domain to your local whitelist." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:471 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472 msgid "Additional Jail Blocklist" msgstr "" @@ -57,11 +57,11 @@ msgstr "" msgid "Advanced Report Settings" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:465 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:466 msgid "Allow Local Client IPs" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:465 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:466 msgid "" "Allow all requests of certain DNS clients based on their IP address (RPZ-" "CLIENT-IP). Please note: This feature is currently only supported by bind " @@ -86,7 +86,6 @@ msgid "" "downloading, sorting, merging etc." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js:15 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:34 msgid "" "Blacklist changes have been saved. Refresh your adblock lists that changes " @@ -97,11 +96,11 @@ msgstr "" msgid "Blacklist..." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:459 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:460 msgid "Block Local Client IPs" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:459 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:460 msgid "" "Block all requests of certain DNS clients based on their IP address (RPZ-" "CLIENT-IP). Please note: This feature is currently only supported by bind " @@ -133,7 +132,7 @@ msgstr "" msgid "Blocklist Sources" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:471 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472 msgid "" "Builds an additional DNS blocklist to block access to all domains except " "those listed in the whitelist. Please note: You can use this restrictive " @@ -148,7 +147,7 @@ msgstr "" msgid "Cancel" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:573 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:569 msgid "Categories" msgstr "" @@ -185,11 +184,11 @@ msgstr "" msgid "DNS Backend" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:429 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:430 msgid "DNS Directory" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:433 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:434 msgid "DNS Instance" msgstr "" @@ -198,7 +197,7 @@ msgstr "" msgid "DNS Report" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:443 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:444 msgid "DNS Restart Timeout" msgstr "" @@ -206,11 +205,11 @@ msgstr "" msgid "Date" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:456 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:457 msgid "Disable DNS Allow" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:456 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:457 msgid "Disable selective DNS whitelisting (RPZ-PASSTHRU)." msgstr "" @@ -242,11 +241,7 @@ msgstr "" msgid "E-Mail Notification" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:527 -msgid "E-Mail Notification Count" -msgstr "" - -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:523 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:524 msgid "E-Mail Profile" msgstr "" @@ -254,11 +249,11 @@ msgstr "" msgid "E-Mail Receiver Address" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:515 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:516 msgid "E-Mail Sender Address" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:519 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:520 msgid "E-Mail Topic" msgstr "" @@ -270,7 +265,7 @@ msgstr "" msgid "Edit Whitelist" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:453 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:454 msgid "" "Empty the DNS cache before adblock processing starts to reduce the memory " "consumption." @@ -310,17 +305,17 @@ msgstr "" msgid "Existing job(s)" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:448 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:449 msgid "External DNS Lookup Domain" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:448 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:449 msgid "" "External domain to check for a successful DNS backend restart. Please note: " "To disable this check set this option to 'false'." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:438 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:439 msgid "Fifth instance" msgstr "" @@ -336,11 +331,11 @@ msgstr "" msgid "Firewall source zones that should be forced locally." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:434 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:435 msgid "First instance (default)" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:453 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:454 msgid "Flush DNS Cache" msgstr "" @@ -356,7 +351,7 @@ msgstr "" msgid "Forced Zones" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:437 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:438 msgid "Fourth instance" msgstr "" @@ -379,7 +374,7 @@ msgstr "" msgid "Information" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:475 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:476 msgid "Jail Directory" msgstr "" @@ -403,7 +398,7 @@ msgstr "" msgid "Line number to remove" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:487 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:488 msgid "List of available network devices used by tcpdump." msgstr "" @@ -445,7 +440,7 @@ msgstr "" msgid "Overview" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:523 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:524 msgid "Profile used by 'msmtp' for adblock notification E-Mails." msgstr "" @@ -457,12 +452,6 @@ msgstr "" msgid "Query active blocklists and backups for a specific domain." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:527 -msgid "" -"Raise the notification count, to get E-Mails if the overall blocklist count " -"is less or equal to the given limit." -msgstr "" - #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:365 msgid "Receiver address for adblock notification e-mails." msgstr "" @@ -512,39 +501,39 @@ msgstr "" msgid "Remove an existing job" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:495 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:496 msgid "Report Chunk Count" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:500 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:501 msgid "Report Chunk Size" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:491 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:492 msgid "Report Directory" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:487 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:488 msgid "Report Interface" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:505 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:506 msgid "Report Ports" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:495 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:496 msgid "Report chunk count used by tcpdump." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:500 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:501 msgid "Report chunk size used by tcpdump in MByte." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:509 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:510 msgid "Resolve IPs" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:509 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:510 msgid "Resolve reporting IP addresses by using reverse DNS (PTR) lookups." msgstr "" @@ -578,7 +567,7 @@ msgstr "" msgid "Save" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:435 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:436 msgid "Second instance" msgstr "" @@ -588,7 +577,7 @@ msgid "" "additional 'msmtp' package installation." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:515 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:516 msgid "Sender address for adblock notification E-Mails." msgstr "" @@ -596,7 +585,7 @@ msgstr "" msgid "Set a new adblock job" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:433 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:434 msgid "Set the dns backend instance used by adblock." msgstr "" @@ -604,11 +593,11 @@ msgstr "" msgid "Settings" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:549 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:545 msgid "Sources (Size, Focus)" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:505 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:506 msgid "Space separated list of ports used by tcpdump." msgstr "" @@ -632,7 +621,7 @@ msgstr "" msgid "TLD Compression" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:491 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:492 msgid "Target directory for DNS related report files." msgstr "" @@ -640,11 +629,11 @@ msgstr "" msgid "Target directory for blocklist backups." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:429 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:430 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:475 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:476 msgid "Target directory for the generated jail blocklist 'adb_list.jail'." msgstr "" @@ -658,6 +647,18 @@ msgstr "" msgid "The Refresh Timer has been updated." msgstr "" +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js:15 +msgid "" +"The changes to the blacklist have been saved. Reload your adblock lists for " +"the changes to take effect." +msgstr "" + +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js:15 +msgid "" +"The changes to the whitelist have been saved. Reload your adblock lists for " +"the changes to take effect." +msgstr "" + #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:56 msgid "The day of the week (opt., values: 0-6 possibly sep. by , or -)" msgstr "" @@ -676,7 +677,7 @@ msgid "" "from the final DNS blocklist." msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:436 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:437 msgid "Third instance" msgstr "" @@ -704,7 +705,7 @@ msgstr "" msgid "Time" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:443 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:444 msgid "Timeout to wait for a successful DNS backend restart." msgstr "" @@ -718,7 +719,7 @@ msgstr "" msgid "Top Statistics" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:519 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:520 msgid "Topic for adblock notification E-Mails." msgstr "" @@ -735,9 +736,9 @@ msgstr "" msgid "Unable to save changes: %s" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:588 -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:604 -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:620 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:584 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:600 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:616 msgid "Variants" msgstr "" @@ -746,7 +747,6 @@ msgid "Verbose Debug Logging" msgstr "" #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:69 -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js:15 msgid "" "Whitelist changes have been saved. Refresh your adblock lists that changes " "take effect." @@ -764,7 +764,7 @@ msgstr "" msgid "dnsmasq (/tmp/dnsmasq.d)" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:424 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:425 msgid "kresd (/etc/kresd)" msgstr "" @@ -776,10 +776,14 @@ msgstr "" msgid "max. top statistics" msgstr "" -#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:425 +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:426 msgid "raw (/tmp)" msgstr "" +#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:424 +msgid "smartdns (/tmp/smartdns)" +msgstr "" + #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:422 msgid "unbound (/var/lib/unbound)" msgstr ""