Merge pull request #5180 from dibdot/adblock

luci-app-adblock: expose dns instance option

1 files changed, 71 insertions, 43 deletions

diff --git a/applications/luci-app-adblock/po/zh_Hans/adblock.po b/applications/luci-app-adblock/po/zh_Hans/adblock.po
index 00730a307e..59a7fdaa85 100644
--- a/applications/luci-app-adblock/po/zh_Hans/adblock.po
+++ b/applications/luci-app-adblock/po/zh_Hans/adblock.po
@@ -50,7 +50,7 @@ msgstr "添加此域名到本地黑名单。"
 msgid "Add this (sub-)domain to your local whitelist."
 msgstr "添加此域名到本地白名单。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:468
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:478
 msgid "Additional Jail Blocklist"
 msgstr "其它被屏蔽列表"
 
@@ -74,11 +74,11 @@ msgstr "高级设置 - 邮箱"
 msgid "Advanced Report Settings"
 msgstr "高级设置 - 报告"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:462
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472
 msgid "Allow Local Client IPs"
 msgstr "允许本地客户端 IP"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:462
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472
 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 "
@@ -116,11 +116,11 @@ msgstr "黑名单更改已保存。刷新您的广告拦截列表以使更改生
 msgid "Blacklist..."
 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:466
 msgid "Block Local Client IPs"
 msgstr "拦截本地客户端IP"
 
-#: 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:466
 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 "
@@ -154,7 +154,7 @@ msgstr "黑名单查询..."
 msgid "Blocklist Sources"
 msgstr "阻止列表内容"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:468
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:478
 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 "
@@ -171,8 +171,8 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:575
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:590
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:585
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:600
 msgid "Categories"
 msgstr "类别"
 
@@ -216,13 +216,17 @@ msgstr "DNS后端"
 msgid "DNS Directory"
 msgstr "DNS 目录"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:440
+msgid "DNS Instance"
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:355
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:8
 #: applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json:27
 msgid "DNS Report"
 msgstr "DNS报告"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:440
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:450
 msgid "DNS Restart Timeout"
 msgstr "DNS重新启动超时"
 
@@ -230,21 +234,21 @@ msgstr "DNS重新启动超时"
 msgid "Date"
 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:463
 msgid "Disable DNS Allow"
 msgstr "禁用DNS允许"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:477
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:487
 msgid "Disable DNS Restarts"
 msgstr "禁用DNS重新启动"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:477
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:487
 msgid ""
 "Disable adblock triggered restarts for dns backends with autoload/inotify "
 "functions."
 msgstr "禁止广告拦截触发具有 自动加载/inotify 功能的 DNS 后端的重新启动。"
 
-#: 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:463
 msgid "Disable selective DNS whitelisting (RPZ-PASSTHRU)."
 msgstr "禁用选择性DNS白名单（RPZ-PASSTHRU）。"
 
@@ -280,11 +284,11 @@ msgstr "下载工具"
 msgid "E-Mail Notification"
 msgstr "电子邮件通知"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:529
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:539
 msgid "E-Mail Notification Count"
 msgstr "电子邮件通知计数"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:525
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:535
 msgid "E-Mail Profile"
 msgstr "电子邮件概要"
 
@@ -292,11 +296,11 @@ msgstr "电子邮件概要"
 msgid "E-Mail Receiver Address"
 msgstr "电子邮件收件人地址"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:517
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:527
 msgid "E-Mail Sender Address"
 msgstr "电子邮件发件人地址"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:521
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:531
 msgid "E-Mail Topic"
 msgstr "电子邮件主题"
 
@@ -344,11 +348,11 @@ msgstr "强制执行Google，Bing，Duckduckgo，Yandex，youtube和Google的Saf
 msgid "Existing job(s)"
 msgstr "现有任务"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:445
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:455
 msgid "External DNS Lookup Domain"
 msgstr "外部DNS查找域"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:445
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:455
 msgid ""
 "External domain to check for a successful DNS backend restart. Please note: "
 "To disable this check set this option to 'false'."
@@ -356,6 +360,10 @@ msgstr ""
 "外部域，用于检查DNS后端是否成功重启。请注意：要禁用此检查，请将此选项设置为“ "
 "false”。"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:445
+msgid "Fifth instance"
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:157
 msgid "Filter criteria like date, domain or client (optional)"
 msgstr "过滤条件，例如日期，域或客户（可选）"
@@ -368,11 +376,15 @@ msgstr "本地应强制使用的防火墙端口。"
 msgid "Firewall source zones that should be forced locally."
 msgstr "本地应强制使用的防火墙源域。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:450
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:441
+msgid "First instance (default)"
+msgstr ""
+
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:460
 msgid "Flush DNS Cache"
 msgstr "清空 DNS 缓存"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:450
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:460
 msgid "Flush the DNS Cache before adblock processing as well."
 msgstr "在处理广告过滤之前刷新 DNS 缓存。"
 
@@ -388,6 +400,10 @@ msgstr "强制端口"
 msgid "Forced Zones"
 msgstr "强制域"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:444
+msgid "Fourth instance"
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:355
 msgid ""
 "Gather DNS related network traffic via tcpdump and provide a DNS Report on "
@@ -409,7 +425,7 @@ msgstr "授予访问 LuCI 应用 adblock 的权限"
 msgid "Information"
 msgstr "信息"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:482
 msgid "Jail Directory"
 msgstr "黑名单目录"
 
@@ -433,7 +449,7 @@ msgstr "限定特定搜索引擎使用安全搜索。"
 msgid "Line number to remove"
 msgstr "要移除的行号"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:488
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:498
 msgid "List of available network devices used by tcpdump."
 msgstr "tcpdump使用的可用网络设备列表."
 
@@ -484,7 +500,7 @@ msgstr "尚无与广告拦截相关的日志！"
 msgid "Overview"
 msgstr "概览"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:525
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:535
 msgid "Profile used by 'msmtp' for adblock notification E-Mails."
 msgstr "'msmtp' 用于adblock通知电子邮件的配置文件。"
 
@@ -496,7 +512,7 @@ msgstr "查询"
 msgid "Query active blocklists and backups for a specific domain."
 msgstr "查询特定域的活动阻止列表和备份."
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:529
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:539
 msgid ""
 "Raise the notification count, to get E-Mails if the overall blocklist count "
 "is less or equal to the given limit."
@@ -554,39 +570,39 @@ msgstr "重新加载"
 msgid "Remove an existing job"
 msgstr "移除一个现有任务"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:497
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:507
 msgid "Report Chunk Count"
 msgstr "报告区块计数"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:502
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:512
 msgid "Report Chunk Size"
 msgstr "报告区块大小"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:493
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:503
 msgid "Report Directory"
 msgstr "报告目录"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:488
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:498
 msgid "Report Interface"
 msgstr "报告接口"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:507
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:517
 msgid "Report Ports"
 msgstr "报告端口"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:497
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:507
 msgid "Report chunk count used by tcpdump."
 msgstr "报告 tcpdump 所使用的区块数量。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:502
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:512
 msgid "Report chunk size used by tcpdump in MByte."
 msgstr "报告 tcpdump 所使用的区块大小 (以 MByte 显示)。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:511
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:521
 msgid "Resolve IPs"
 msgstr "解析多个 IP 地址"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:511
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:521
 msgid "Resolve reporting IP addresses by using reverse DNS (PTR) lookups."
 msgstr "使用 DNS (PTR) 反查找解析报告中的IP地址。"
 
@@ -620,13 +636,17 @@ msgstr "运行工具"
 msgid "Save"
 msgstr "保存"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:442
+msgid "Second instance"
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:359
 msgid ""
 "Send adblock related notification e-mails. Please note: this needs "
 "additional 'msmtp' package installation."
 msgstr "发送 AdBlock 相关的通知邮件。请留意：此功能需要安装 \"msmtp\"。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:517
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:527
 msgid "Sender address for adblock notification E-Mails."
 msgstr "AdBlock 通知邮件的发送地址。"
 
@@ -634,6 +654,10 @@ msgstr "AdBlock 通知邮件的发送地址。"
 msgid "Set a new adblock job"
 msgstr "设置一个新的广告拦截作业"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:440
+msgid "Set the dns backend instance used by adblock."
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:297
 msgid "Settings"
 msgstr "设置"
@@ -644,11 +668,11 @@ msgid ""
 "etc.) in parallel."
 msgstr "并行下载处理 (分类、合并等) 的下载队列大小。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:551
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:561
 msgid "Sources (Size, Focus)"
 msgstr "来源（大小，焦点）"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:507
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:517
 msgid "Space separated list of ports used by tcpdump."
 msgstr "tcpdump使用的端口列表，用空格分隔端口。"
 
@@ -668,7 +692,7 @@ msgstr "状态 / 版本"
 msgid "Suspend"
 msgstr "暂停"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:493
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:503
 msgid "Target directory for DNS related report files."
 msgstr "DNS 相关报告文件的目标目录。"
 
@@ -680,7 +704,7 @@ msgstr "拦截列表备份的目标目录。"
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "生成拦截列表“adb_list.overall”的目标目录。"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:472
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:482
 msgid "Target directory for the generated jail blocklist 'adb_list.jail'."
 msgstr "生成拦截列表“adb_list.overall”的目标目录。"
 
@@ -710,6 +734,10 @@ msgstr "分钟（可选。取值范围：0-59）"
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr "系统日志输出，仅针对 adblock 相关的消息进行了预筛选。"
 
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:443
+msgid "Third instance"
+msgstr ""
+
 #: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js:23
 msgid ""
 "This is the local adblock blacklist to always-deny certain (sub) domains."
@@ -738,7 +766,7 @@ msgstr "此选项卡显示上次生成的 DNS 报告，按“刷新”按钮获�
 msgid "Time"
 msgstr "时间"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:440
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:450
 msgid "Timeout to wait for a successful DNS backend restart."
 msgstr "等待成功的DNS后端重新启动的超时。"
 
@@ -752,7 +780,7 @@ msgstr "为了使您的广告过滤列表保持最新，您应该为这些列表
 msgid "Top 10 Statistics"
 msgstr "前 10 统计数据"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:521
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:531
 msgid "Topic for adblock notification E-Mails."
 msgstr "广告拦截通知邮件的主题。"
 
@@ -769,8 +797,8 @@ msgstr "触发延时"
 msgid "Unable to save changes: %s"
 msgstr "无法保存更改：%s"
 
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:605
-#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:621
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:615
+#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js:631
 msgid "Variants"
 msgstr "变种"