summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po286
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po303
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po319
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po310
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po289
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot283
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po313
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po313
-rw-r--r--applications/luci-app-mwan3/po/ja/mwan3.po50
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_server.lua127
-rw-r--r--applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po326
-rw-r--r--applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua4
-rw-r--r--applications/luci-app-wifischedule/po/de/wifischedule.po101
-rw-r--r--contrib/package/csstidy/Makefile6
-rw-r--r--libs/luci-lib-jsonc/src/jsonc.c77
-rw-r--r--modules/luci-base/po/ja/base.po9
-rw-r--r--modules/luci-base/po/zh-tw/base.po2
-rw-r--r--themes/luci-theme-material/htdocs/luci-static/material/cascade.css2
18 files changed, 2437 insertions, 683 deletions
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 3c32091b5..49d42cf56 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -11,18 +11,23 @@ msgstr ""
"X-Generator: Poedit 2.0.3\n"
"Language: it\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -34,27 +39,45 @@ msgstr "Status Adblock"
msgid "Adblock Version"
msgstr "Versione Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "Avanzato"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "Directory del Backup"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "Fonti lista di Blocco"
@@ -62,13 +85,13 @@ msgstr "Fonti lista di Blocco"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -76,37 +99,60 @@ msgstr ""
"Scegli 'none' per disabilitare l'avvio automatico, 'timed' per usare un "
"classico timeout (default 30 sec.) o seleziona un'altra interfaccia di avvio."
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "Raccogliendo dati..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
"Configurazione del pacchetto adblock per bloccare domini pubblicità/abuso "
"usando i DNS."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "Directory DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "Descrizione"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -114,7 +160,14 @@ msgstr ""
"Non aggiornare automaticamente le liste durante l'avvio, usa invece i backup "
"della lista di blocco."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr ""
@@ -122,85 +175,99 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "Modifica Lista Nera"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "Modifica Configurazione"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "Modifica Lista Bianca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "Attiva Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "Attiva Backup Lista di Blocco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Abilita il registro dettagliato in caso di qualsiasi errore di processo."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "Abilitato"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "Opzioni Extra"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "Forza DNS Locale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "Forza Ordinamento Globale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -211,39 +278,53 @@ msgstr "File di input non trovato, per favore controlla la tua configurazione."
msgid "Last Run"
msgstr "Ultimo Avvio"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Caricando"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -274,26 +355,29 @@ msgid "Please edit this file directly in a terminal session."
msgstr ""
"Per favore modifica questo file direttamente in una sessione al terminale."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "Interrogazione"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "Interrogazione domini"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -310,6 +394,38 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Riprendi"
@@ -318,7 +434,7 @@ msgstr "Riprendi"
msgid "Runtime Information"
msgstr "Informazione di Runtime"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "Ric. SSL"
@@ -328,25 +444,29 @@ msgstr "Ric. SSL"
msgid "Save"
msgstr "Salva"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "Innesco d'Avvio"
@@ -360,13 +480,19 @@ msgstr "Sospendi"
msgid "Suspend / Resume Adblock"
msgstr "Sospendi / Riprendi Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
@@ -380,7 +506,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -410,7 +536,12 @@ msgstr ""
"Questo form ti consente di interrogare le liste di blocco attive per "
"determinati domini, p.e. per metterli nella lista bianca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -418,38 +549,49 @@ msgstr ""
"Per sovrascrivere il percorso di default usa l'opzione 'Directory DNS' nella "
"sezione aggiuntiva sotto."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "Ritardo Innesco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "Registro di Debug Dettagliato"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "Vedi Registro"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "Aspettando che il comando venga completato..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "Sì"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
+
+#~ msgid "View Logfile"
+#~ msgstr "Vedi Registro"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 442a13138..a956d6386 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,14 +8,14 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2\n"
"Language: ja\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr "'Jail' ブロックリストの作成"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -23,8 +23,13 @@ msgstr ""
"<b>警告:</b> RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスで"
"は、 OutOfMemory (OOM) 例外を防ぐために少数のみを選択してください。"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr "アクション"
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -36,27 +41,45 @@ msgstr "Adblock ステータス"
msgid "Adblock Version"
msgstr "Adblock バージョン"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Adblock の処理が開始されるまでの、追加の遅延時間(秒)です。"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "詳細設定"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr "回答"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr "アーカイブ カテゴリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "バックアップ先 ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr "バックアップ モード"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr "ブラックリスト"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr "ブロックされた DNS クエリ"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr "ブロックされたドメイン"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "ブロックリスト提供元"
@@ -64,7 +87,7 @@ msgstr "ブロックリスト提供元"
msgid "Blocklist not found!"
msgstr "ブロックリストが見つかりません!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -72,7 +95,7 @@ msgstr ""
"ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の "
"'Jail' リスト (/tmp/adb_list.jail) を作成します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -81,18 +104,32 @@ msgstr ""
"秒)を使用するには 'timed' を選択してください。または、他のトリガとなるイン"
"ターフェースを選択してください。"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr "クライアント"
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "データ収集中です..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
"DNS の利用によって広告/不正ドメインをブロックする、Adblock パッケージの設定で"
"す。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr "カウント"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -101,20 +138,29 @@ msgstr ""
"ロードがエラーの場合、またはバックアップ モードでサービスを起動した場合に使用"
"されます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS バックエンド(DNS ディレクトリ)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "DNS ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr "DNS クエリ レポート"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr "日付"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "説明"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -122,7 +168,14 @@ msgstr ""
"サービス起動時にブロックリストを自動的に更新せず、代わりにバックアップされた"
"ブロックリストを使用します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr "ドメイン"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
@@ -130,35 +183,39 @@ msgstr "ダウンロード ユーティリティ"
msgid "Download Utility (SSL Library)"
msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "ブラックリストの編集"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "設定の編集"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "ホワイトリストの編集"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr "メール通知"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr "メール通知カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "Adblock の有効化"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "ブロックリスト バックアップの有効化"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr "DNS クエリ レポートの有効化"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -166,28 +223,32 @@ msgstr ""
"メモリー容量の少ないデバイス(RAM 空き領域 64MB 未満)において、一時ファイル"
"内の全体的なソート及び重複の除去を有効にします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"何らかの処理エラーが発生した場合に、詳細なデバッグ ログを有効にします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "有効"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr "終了日"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "拡張オプション"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr "DNS キャッシュのクリア"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -195,7 +256,7 @@ msgstr ""
"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
"確認してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -203,18 +264,26 @@ msgstr ""
"パフォーマンスの更なる改善のため、安全と思われる '8' や '16' などの値に引き上"
"げることができます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "ローカル DNS の強制"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "全体ソートの強制"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr "ホワイトリスト ファイルへのフルパスです。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+"tcpdump によって DNS 関連のネットワークトラフィックを収集し、 オンデマンドの"
+"DNS クエリレポートを提供します。"
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -225,7 +294,11 @@ msgstr "入力ファイルが見つかりません。設定を確認してくだ
msgid "Last Run"
msgstr "最終実行"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr "最新の DNS クエリ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -233,35 +306,45 @@ msgstr ""
"利用可能なネットワーク インターフェースの一覧です。通常、スタートアップは "
"'wan' インターフェースによってトリガされます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で"
"す。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "読込中"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr "ログファイル"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr "低優先度サービス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr "ダウンロード キューの上限"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr "名前 / IP アドレス"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "いいえ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
@@ -290,21 +373,26 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "ターミナル セッションで直接このファイルを編集してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+"注意: これは手動での 'msmtp' パッケージのインストールとセットアップを必要とし"
+"ます。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
-"注意: これには、追加で 'msmtp' のインストールとセットアップが必要です。"
+"注意: これは手動での 'tcpdump-mini' パッケージのインストールを必要とします。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "検索"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "ドメインの検索"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -312,7 +400,7 @@ msgstr ""
"メール通知を行うメール通知カウントの下限値を設定します。全体カウントが指定さ"
"れた値以下の場合、メールを受け取ります(規定値: 0)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -331,6 +419,40 @@ msgstr "リフレッシュ"
msgid "Refresh Blocklist Sources"
msgstr "ブロックリスト提供元のリフレッシュ"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr "レポートをリフレッシュ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr "レポート チャンクカウント"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr "レポート チャンクサイズ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr "レポート ディレクトリ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr "レポート インターフェース"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr "tcpdump により使用される、レポートチャンク数です。(規定値: '5')"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr "tcpdump により使用される、レポート チャンクサイズです。(規定値: '1')"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+"tcpdump により使用される、レポートを行うインターフェースです。(規定値: 'br-"
+"lan')"
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "再開"
@@ -339,7 +461,7 @@ msgstr "再開"
msgid "Runtime Information"
msgstr "実行情報"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "SSL 必須"
@@ -349,14 +471,14 @@ msgstr "SSL 必須"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
"処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
@@ -364,15 +486,19 @@ msgstr ""
"nice値(優先度)を '低優先度' に設定し、adblock バックグラウンド処理のシステ"
"ムリソース使用量を抑制します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
msgstr ""
-"ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ"
-"です(規定値: '4')。"
+"ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ"
+"ズです。(規定値: '8')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
+msgstr "開始日"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "スタートアップ トリガ"
@@ -386,15 +512,23 @@ msgstr "一時停止"
msgid "Suspend / Resume Adblock"
msgstr "Adblock の一時停止 / 再開"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-"Adblock バックアップの保存先ディレクトリです。 外部 USB フラッシュメモリなど"
-"の不揮発性ドライブのみを使用してください。"
+"adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用して"
+"ください。(例: 外部 USB スティック)"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+"DNS 関連レポートファイルの保存先ディレクトリです。可能であれば不揮発性ディス"
+"クを使用してください。(例: 外部 USB スティック)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成されたブロックリスト 'adb_list.overall' の保存先ディレクトリです。"
@@ -410,7 +544,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。"
@@ -444,7 +578,12 @@ msgstr ""
"このフォームでは、現在有効なリスト内で特定のドメインを検索することができま"
"す。例: ホワイトリスト内"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr "時刻"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -452,39 +591,47 @@ msgstr ""
"デフォルトのパスを上書きするには、下記拡張セクションの 'DNS ディレクトリ' オ"
"プションを使用します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr "上位 10 レポート"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr "総 DNS クエリ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "トリガ遅延"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "詳細なデバッグ ログ"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "ログファイルを見る"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "コマンド実行中です..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr "ホワイトリスト"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr "ホワイトリスト ファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "はい"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
"この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに手"
"動で利用することができます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 3a0658b74..1146dd716 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -12,11 +12,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr "'Enjaule' Criação de Lista Negra"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -24,8 +24,13 @@ msgstr ""
"<b>Cudiado:</b> Selecione apenas alguns para evitar erros de falta de "
"memória em dispositivos com menos que 64MB de RAM livres!"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -37,29 +42,47 @@ msgstr "Estado do Adblock"
msgid "Adblock Version"
msgstr "Versão do Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Atraso de gatilho adicional em segundos antes do processamento do adblock "
"começar."
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "Avançado"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr "Categorias Arquivadas"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr "Modo de Backup"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "Fontes de listas de bloqueio"
@@ -67,7 +90,7 @@ msgstr "Fontes de listas de bloqueio"
msgid "Blocklist not found!"
msgstr "Lista preta não encontrada!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -75,7 +98,7 @@ msgstr ""
"Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a todos "
"os domínios exceto aqueles listados na lista branca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -84,18 +107,32 @@ msgstr ""
"usar o estouro de tempo clássico (padrão 30 segundos) ou outro gatilho pela "
"interface."
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "Coletando dados..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
"Configuração do pacote adblock para bloquear, usando o DNS, domínios que "
"distribuem propagandas abusivas."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -104,20 +141,29 @@ msgstr ""
"usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
"backup."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "Serviço DNS (Diretório DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "Diretório DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -125,7 +171,14 @@ msgstr ""
"Não atualize as listas de bloqueio automaticamente durante o início, use o "
"backup das listas como alternativa."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
@@ -133,35 +186,39 @@ msgstr "Ferramenta para Baixar"
msgid "Download Utility (SSL Library)"
msgstr "Utilitário de Download (Biblioteca SSL)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "Editar Lista de Bloqueio"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "Editar Configuração"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "Editar Lista Permitida"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr "Notificação por Email"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr "Quantidade para Notificação por Email"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "Habilitar adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "Habilitar cópia de segurança da lista de bloqueio"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -169,29 +226,33 @@ msgstr ""
"Habilita a remoção de entradas duplicadas em dispositivos com pouca memória "
"(&lt; 64 MB de memória RAM livre)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilita os registros de depuração detalhados em caso de qualquer erro de "
"processamento."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "Habilitado"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "Opções adicionais"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr "Limpar cache DNS depois do processamento do adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -199,7 +260,7 @@ msgstr ""
"Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
"externa</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -207,18 +268,24 @@ msgstr ""
"Para melhoramentos no desempenho, você pode aumentar este valor (ex: '8' ou "
"'16' deve ser seguro)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "Force o DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "Force Tipo Geral"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr "Caminho completo para a lista branca."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -229,7 +296,11 @@ msgstr "Arquivo de entrada não encontrado, por favor cheque sua configuração.
msgid "Last Run"
msgstr "Última Execução"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -237,35 +308,45 @@ msgstr ""
"Lista das interfaces de redes disponíveis. Normalmente, o início será "
"desencadeado pela interface 'wan'."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
"Lista dos serviços DNS suportados com seu diretório padrão de exportação de "
"lista."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr "Lista de ferramentas suportadas para baixar listas."
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Carregando"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr "Serviço de Baixa Prioridade"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr "Tamanho Máximo da Fila"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "Não"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -296,20 +377,23 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Por favor edite esse arquivo direto em uma sessão de terminal."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "Consulta"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "Consulta de domínios"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -317,7 +401,7 @@ msgstr ""
"Aumente a quantidade mínima para notificar por email para receber mensagens "
"se a contagem total for menos ou igual a este limite (padrão 0)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -336,6 +420,38 @@ msgstr "Atualizar"
msgid "Refresh Blocklist Sources"
msgstr "Atualizar as Fontes de Lista Negra"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Continuar"
@@ -344,7 +460,7 @@ msgstr "Continuar"
msgid "Runtime Information"
msgstr "Informação de execução"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "Req. de SSL"
@@ -354,7 +470,7 @@ msgstr "Req. de SSL"
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
@@ -362,7 +478,7 @@ msgstr ""
"Enviar notificações por email se ocorrer um erro de processamento ou se a "
"contagem por domínio for menor que 0."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
@@ -370,15 +486,17 @@ msgstr ""
"Define o nível de prioridade para 'baixa', reduzindo o impacto do "
"processamento em segundo plano do adblock no seu sistema."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
msgstr ""
-"Tamanho da fila responsável por baixar e processamento em paralelo (padrão "
-"'4')."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "Gatilho de Iniciação"
@@ -392,15 +510,19 @@ msgstr "Suspender"
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Resumir adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-"Diretório para cópias de segurança do adblock. Use somente destinos não "
-"voláteis, como dispositivos de armazenamento USB."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Diretório para a lista nega gerada 'adb_list.overall'."
@@ -415,7 +537,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Mensagens do syslog relacionadas ao adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "Esta mudança requer um reinício manual do serviço para ser efetivada."
@@ -445,7 +567,12 @@ msgstr ""
"Esse formulário permite que você consulte listas de blocos ativos para "
"certos domínios, e.x. para listas de permissão."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -453,42 +580,76 @@ msgstr ""
"Para sobrescrever o caminho padrão, use a opção 'Diretório DNS' na seção "
"extra abaixo."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "Atraso no gatilho"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "Registros de Depuração Detalhados"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "Ver arquivo de log"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "Aguardando por comando para completar..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr "Lista Branca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "Sim"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-"Você pode usar esta lista de bloqueio restritiva para, por exemplo, redes de "
-"convidados ou para crianças."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
"ex: para receber notificação por email a cada atualização do adblock, ajuste "
"este valor para 150000."
+
+#~ msgid ""
+#~ "Please note: this needs additional 'msmtp' package installation and setup."
+#~ msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'."
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4')."
+#~ msgstr ""
+#~ "Tamanho da fila responsável por baixar e processamento em paralelo "
+#~ "(padrão '4')."
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only non-volatile disks, "
+#~ "e.g. an external usb stick."
+#~ msgstr ""
+#~ "Diretório para cópias de segurança do adblock. Use somente destinos não "
+#~ "voláteis, como dispositivos de armazenamento USB."
+
+#~ msgid "View Logfile"
+#~ msgstr "Ver arquivo de log"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
+#~ "kidsafe configurations."
+#~ msgstr ""
+#~ "Você pode usar esta lista de bloqueio restritiva para, por exemplo, redes "
+#~ "de convidados ou para crianças."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index dad07b7c6..3aed4fe7b 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -15,11 +15,11 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr "Создание Черного<br />списка 'Jail'"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -27,8 +27,13 @@ msgstr ""
"<b>Внимание:</b> Для предотвращения переполнения ОЗУ, на устройствахс ОЗУ "
"менее 64MB, выбирайте только необходимый минимум списков!"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "AdBlock"
@@ -40,27 +45,45 @@ msgstr "Состояние Adblock"
msgid "Adblock Version"
msgstr "Версия Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Дополнительная задержка в секундах до начала работы Adblock."
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "Дополнительно"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "Папка для бэкапа"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr "Режим сохранения бекапа"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "Источники списков блокировок"
@@ -68,13 +91,13 @@ msgstr "Источники списков блокировок"
msgid "Blocklist not found!"
msgstr "Список блокировок не найден!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -83,18 +106,32 @@ msgstr ""
"использовать стандартную задержку (по умолчанию 30 сек.) или выберите другой "
"интерфейс для запуска."
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "Сбор данных..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
"Настройка Adblock. Приложения для блокировки ненадежных или добавления "
"доверенных доменов используя DNS. "
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -102,20 +139,29 @@ msgstr ""
"Создание сжатых резервных копий списков блокировок, они будут использоваться "
"в случае ошибок загрузки или при запуске в ручном режиме."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS бэкенд (папка DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "Папка DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "Описание"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -123,7 +169,14 @@ msgstr ""
"Не обновлять списки блокировок автоматически во время запуска, вместо этого "
"использовать резервные копии списков блокировок."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr "Утилита для скачивания"
@@ -131,35 +184,39 @@ msgstr "Утилита для скачивания"
msgid "Download Utility (SSL Library)"
msgstr "Утилита для скачивания (с библиотекой SSL)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "Редактировать Черный список"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "Редактировать config файл"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "Редактировать Белый список"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr "Email уведомления"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr "Кол-во email уведомлений"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "Включить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "Бэкап списка блокировок"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -168,27 +225,31 @@ msgstr ""
"устройствах с низким объемом памяти (&lt; 64 MB свободной оперативной "
"памяти)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "Включено"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "Дополнительные настройки"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr "Очистка DNS-кэша после обработки Adblock-ом."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -196,7 +257,7 @@ msgstr ""
"<br />Для получения дополнительной информации <a href=\"%s\" target=\"_blank"
"\"> смотрите онлайн документацию</a>."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -204,18 +265,24 @@ msgstr ""
"Для дополнительного повышения производительности вы можете увеличить это "
"значение, например значения '8' или '16' должны быть безопасными."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "Локальный DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "Принудительная полная сортировка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого списка."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -226,41 +293,55 @@ msgstr "Config файл не найден, настройте config файл."
msgid "Last Run"
msgstr "Последний запуск"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"Список поддерживаемых и полностью предварительно настроенных утилит для "
"скачивания."
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Загрузка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr "Максимальная очередь загрузки"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "Нет"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -290,26 +371,29 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Редактируйте данный файл только в терминале."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "Запрос"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "Запрос доменов"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -326,6 +410,38 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Возобновить"
@@ -334,7 +450,7 @@ msgstr "Возобновить"
msgid "Runtime Information"
msgstr "Информация о состоянии"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "Запрос SSL"
@@ -344,25 +460,29 @@ msgstr "Запрос SSL"
msgid "Save"
msgstr "Сохранить"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "Триггер запуска"
@@ -376,15 +496,19 @@ msgstr "Приостановить"
msgid "Suspend / Resume Adblock"
msgstr "Приостановить / Возобновить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-"Папка для бэкапов списков блокировок. Используйте такие накопители, как usb "
-"флешка."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Папка для созданного списка блокировки 'adb_list.overall'."
@@ -400,7 +524,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -430,7 +554,12 @@ msgstr ""
"Данное поле позволяет запросить домены для конкретных списков, например для "
"Белого списка."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -438,42 +567,69 @@ msgstr ""
"Чтобы заменить путь по умолчанию, используйте пункт 'Папка DNS' в разделе "
"'Дополнительные настройки'."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "Задержка запуска"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "Подробный журнал отладки"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "Системный журнал"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "Ожидание завершения выполнения команды..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr "Файл Белого списка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "Да"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-"Вы можете вручную настраивать и использовать этот Черный список, например "
-"для гостевой wifi сети или режима родительского контроля."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
"например, чтобы получать email уведомления при каждом обновлении Adblock-а "
"установите значение 150000."
+
+#~ msgid ""
+#~ "Please note: this needs additional 'msmtp' package installation and setup."
+#~ msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'."
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only non-volatile disks, "
+#~ "e.g. an external usb stick."
+#~ msgstr ""
+#~ "Папка для бэкапов списков блокировок. Используйте такие накопители, как "
+#~ "usb флешка."
+
+#~ msgid "View Logfile"
+#~ msgstr "Системный журнал"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
+#~ "kidsafe configurations."
+#~ msgstr ""
+#~ "Вы можете вручную настраивать и использовать этот Черный список, например "
+#~ "для гостевой wifi сети или режима родительского контроля."
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 811182f42..6a934a239 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -1,18 +1,23 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -24,27 +29,45 @@ msgstr "Status för Adblock"
msgid "Adblock Version"
msgstr "Version av Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "Avancerat"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "Källor för blockeringslistor"
@@ -52,13 +75,13 @@ msgstr "Källor för blockeringslistor"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -67,37 +90,60 @@ msgstr ""
"använda ett klassiskt avbrott (30 sek. är standard) eller välj ett annat "
"utlösande gränssnitt."
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "Samlar in data..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
"Konfiguration av paketet adblock för att blockera annons/otillåtna domäner "
"genom att använda DNS."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr "Räkna"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS-bakände (DNS-mapp)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "DNS-mapp"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "Beskrivning"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -105,7 +151,14 @@ msgstr ""
"Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
"säkerhetskopierade blockeringslistor istället."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr ""
@@ -113,84 +166,98 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr "Nerladdningsprogram (SSL-bibliotek)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "Redigera svartlista"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "Redigerar konfigurationen"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "Redigera vitlista"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "Aktivera adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "Aktivera säkerhetskopiering av blockeringslistan"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "Aktiverad"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "Extra alternativ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "Tvinga lokal DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -202,39 +269,53 @@ msgstr ""
msgid "Last Run"
msgstr "Kördes senast"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Laddar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "Nej"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -260,26 +341,29 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Vänligen redigera den här filen direkt i en terminal-session."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "Fråga"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "Fråga efter domäner"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -296,6 +380,38 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Återuppta"
@@ -304,7 +420,7 @@ msgstr "Återuppta"
msgid "Runtime Information"
msgstr "Information om körtid"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "SSL-rek."
@@ -314,25 +430,29 @@ msgstr "SSL-rek."
msgid "Save"
msgstr "Spara"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "Uppstartslösare"
@@ -346,13 +466,19 @@ msgstr "Stäng av"
msgid "Suspend / Resume Adblock"
msgstr "Upphäv / Återuppta adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -366,7 +492,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -394,48 +520,64 @@ msgid ""
"for whitelisting."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "Visa loggfil"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "Väntar på att kommandot ska slutföras..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "Ja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
+#~ msgid "View Logfile"
+#~ msgstr "Visa loggfil"
+
#~ msgid "paused"
#~ msgstr "pausad"
@@ -525,9 +667,6 @@ msgstr ""
#~ msgid "see list details"
#~ msgstr "se listans detaljer"
-#~ msgid "Count"
-#~ msgstr "Räkna"
-
#~ msgid "Do not write status info to flash"
#~ msgstr "Skriv inte status info till flash"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 8df46cddc..4510e9249 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -1,18 +1,23 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr ""
@@ -24,27 +29,45 @@ msgstr ""
msgid "Adblock Version"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr ""
@@ -52,53 +75,83 @@ msgstr ""
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr ""
@@ -106,84 +159,98 @@ msgstr ""
msgid "Download Utility (SSL Library)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -194,39 +261,53 @@ msgstr ""
msgid "Last Run"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -252,26 +333,29 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -288,6 +372,38 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr ""
@@ -296,7 +412,7 @@ msgstr ""
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr ""
@@ -306,25 +422,29 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr ""
@@ -338,13 +458,19 @@ msgstr ""
msgid "Suspend / Resume Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -358,7 +484,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -384,43 +510,56 @@ msgid ""
"for whitelisting."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
-msgid "Trigger Delay"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
-msgid "Verbose Debug Logging"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+msgid "Trigger Delay"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+msgid "Verbose Debug Logging"
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index c3f5dfd85..7f77fd855 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -15,11 +15,11 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr "“Jail”拦截列表创建"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -27,8 +27,13 @@ msgstr ""
"<b>注意:</b>为防止在小于 64M 空闲内存的设备上出现内存不足异常,请只选择其中"
"的几个!"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -40,27 +45,45 @@ msgstr "Adblock 状态"
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "触发 Adblock 开始处理前的额外延迟(秒)。"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "高级"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr "存档类别"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "备份目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr "备份模式"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "拦截列表来源"
@@ -68,7 +91,7 @@ msgstr "拦截列表来源"
msgid "Blocklist not found!"
msgstr "拦截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -76,7 +99,7 @@ msgstr ""
"构建一个额外的“Jail”列表(/tmp/adb_list.jail),除白名单文件中列出的域名外,"
"阻止访问其他所有的域名。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -84,41 +107,71 @@ msgstr ""
"选择“none”以禁用自动启动,“timed”以使用默认的超时设定(默认 30 秒),或选择另"
"一个触发接口。"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "正在收集数据..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr "Adblock 配置工具,通过 DNS 来拦截广告和阻止域名。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 后端(DNS 目录)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "DNS 目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr "下载工具"
@@ -126,84 +179,98 @@ msgstr "下载工具"
msgid "Download Utility (SSL Library)"
msgstr "下载实用程序(SSL 库)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "编辑黑名单"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "编辑设置"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "编辑白名单"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr "Email 提醒"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr "Email 提醒计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "启用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "启用 Blocklist 备份"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr "在低内存设备上启用积极的内存整体排序/重复移除(&lt; 64 MB 空闲内存)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "已启用"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "额外选项"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程启动后清空 DNS 缓存。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "为了进一步提高性能,您可以提高此值,例如:8 或 16 应该是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "强制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "强制整体排序"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr "白名单文件的全路径。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -214,39 +281,53 @@ msgstr "输入文件未找到,请检查您的配置。"
msgid "Last Run"
msgstr "最后运行"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr "可用网络接口列表。通常启动将由“wan”接口触发。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支持的 DNS 后端列表及其默认列表导出目录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr "支持和完全预配置的下载工具列表。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "加载中"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr "低优先级服务"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr "最大下载队列"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在默认设置并不适合您时的额外选项。"
@@ -274,20 +355,23 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "请在终端会话中直接编辑此文件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr "请注意:这需要额外的“msmtp”软件包安装和设置。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "查询"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "查询域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -295,7 +379,7 @@ msgstr ""
"如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电子"
"邮件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -314,6 +398,38 @@ msgstr "刷新"
msgid "Refresh Blocklist Sources"
msgstr "刷新拦截列表源"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "恢复"
@@ -322,7 +438,7 @@ msgstr "恢复"
msgid "Runtime Information"
msgstr "运行信息"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "SSL 要求"
@@ -332,25 +448,29 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr "设置 nice 级别为“低优先级”,adblock 后台进程将从系统中获取更少的资源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
-msgstr "处理下载队列的大小及并行处理列表(默认“4”)。"
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "启动触发器"
@@ -364,13 +484,19 @@ msgstr "暂停"
msgid "Suspend / Resume Adblock"
msgstr "暂停/恢复 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
-msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成拦截列表“adb_list.overall”的目标目录。"
@@ -384,7 +510,7 @@ msgstr "文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系统日志输出,仅针对 adblock 相关的消息进行了预筛选。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手动停止/重启服务才能生效。"
@@ -410,45 +536,80 @@ msgid ""
"for whitelisting."
msgstr "此表单允许您查询某些域的活动块列表,例如用于列出白名单。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr "要覆盖默认路径,请使用下面额外部分中的“DNS 目录”选项。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "触发延迟"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "详细的调试记录"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "查看日志文件"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "正在等待命令完成…"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr "白名单文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-"您可以手动使用此限制性拦截列表,例如:为客人提供 wifi 或 kidsafe 配置。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
+
+#~ msgid ""
+#~ "Please note: this needs additional 'msmtp' package installation and setup."
+#~ msgstr "请注意:这需要额外的“msmtp”软件包安装和设置。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4')."
+#~ msgstr "处理下载队列的大小及并行处理列表(默认“4”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only non-volatile disks, "
+#~ "e.g. an external usb stick."
+#~ msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+
+#~ msgid "View Logfile"
+#~ msgstr "查看日志文件"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
+#~ "kidsafe configurations."
+#~ msgstr ""
+#~ "您可以手动使用此限制性拦截列表,例如:为客人提供 wifi 或 kidsafe 配置。"
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 5c1030174..4c34c1a9a 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -15,11 +15,11 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "'Jail' Blocklist Creation"
msgstr "“Jail”攔截列表建立"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -27,8 +27,13 @@ msgstr ""
"<b>注意:</b>為防止在小於 64M 空閒記憶體的裝置上出現記憶體不足異常,請只選擇"
"其中的幾個!"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Action"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid "Adblock"
msgstr "Adblock"
@@ -40,27 +45,45 @@ msgstr "Adblock 狀態"
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "觸發 Adblock 開始處理前的額外延遲(秒)。"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
msgid "Advanced"
msgstr "高階"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Answer"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
msgid "Archive Categories"
msgstr "存檔類別"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Backup Directory"
msgstr "備份目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "Backup Mode"
msgstr "備份模式"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
+msgid "Blacklist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+msgid "Blocked DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
+msgid "Blocked Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Blocklist Sources"
msgstr "攔截列表來源"
@@ -68,7 +91,7 @@ msgstr "攔截列表來源"
msgid "Blocklist not found!"
msgstr "攔截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -76,7 +99,7 @@ msgstr ""
"構建一個額外的“Jail”列表(/tmp/adb_list.jail),除白名單檔案中列出的域名外,"
"阻止訪問其他所有的域名。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -84,41 +107,71 @@ msgstr ""
"選擇“none”以禁用自動啟動,“timed”以使用預設的超時設定(預設 30 秒),或選擇另"
"一個觸發介面。"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Client"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "正在收集資料..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr "Adblock 配置工具,通過 DNS 來攔截廣告和阻止域名。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
+msgid "Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模式啟動期間使用。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 後端(DNS 目錄)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
msgid "DNS Directory"
msgstr "DNS 目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
+msgid "DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Domain"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "Download Utility"
msgstr "下載工具"
@@ -126,85 +179,99 @@ msgstr "下載工具"
msgid "Download Utility (SSL Library)"
msgstr "下載實用程式(SSL 庫)"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Edit Blacklist"
msgstr "編輯黑名單"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Configuration"
msgstr "編輯設定"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
msgid "Edit Whitelist"
msgstr "編輯白名單"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
msgid "Email Notification"
msgstr "Email 提醒"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "Email Notification Count"
msgstr "Email 提醒計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
msgid "Enable Adblock"
msgstr "啟用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Enable Blocklist Backup"
msgstr "啟用 Blocklist 備份"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+msgid "Enable DNS Query Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
"在低記憶體裝置上啟用積極的記憶體整體排序/重複移除(&lt; 64 MB 空閒記憶體)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Enabled"
msgstr "已啟用"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+msgid "End Date"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Extra Options"
msgstr "額外選項"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache"
msgstr "清空 DNS 快取"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 程序啟動後清空 DNS 快取。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "為了進一步提高效能,您可以提高此值,例如:8 或 16 應該是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Force Local DNS"
msgstr "強制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Force Overall Sort"
msgstr "強制整體排序"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
msgid "Full path to the whitelist file."
msgstr "白名單檔案的全路徑。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+msgid ""
+"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
+"on demand."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10
@@ -215,39 +282,53 @@ msgstr "輸入檔案未找到,請檢查您的配置。"
msgid "Last Run"
msgstr "最後執行"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+msgid "Latest DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
msgid "List of supported and fully pre-configured download utilities."
msgstr "支援和完全預配置的下載工具列表。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "載入中"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+msgid "Logfile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Low Priority Service"
msgstr "低優先順序服務"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
msgid "Max. Download Queue"
msgstr "最大下載佇列"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
+msgid "Name / IP-Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在預設設定並不適合您時的額外選項。"
@@ -275,20 +356,23 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "請在終端會話中直接編輯此檔案。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr "請注意:這需要額外的“msmtp”軟體包安裝和設定。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+msgid "Please note: this needs manual 'msmtp' package installation and setup."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+msgid "Please note: this needs manual 'tcpdump-mini' package installation."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
msgstr "查詢"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
msgid "Query domains"
msgstr "查詢域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -296,7 +380,7 @@ msgstr ""
"如果總數小於或等於給定限制(預設為 0),請提高最小電子郵件通知數,以獲取電子"
"郵件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -315,6 +399,38 @@ msgstr "重新整理"
msgid "Refresh Blocklist Sources"
msgstr "重新整理攔截列表源"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+msgid "Refresh Report"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+msgid "Report Chunk Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid "Report Chunk Size"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+msgid "Report Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Report Interface"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+msgid "Report chunk count used by tcpdump (default '5')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+msgid "Report chunk size used by tcpdump in MB (default '1')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid "Reporting interface used by tcpdump (default 'br-lan')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "恢復"
@@ -323,7 +439,7 @@ msgstr "恢復"
msgid "Runtime Information"
msgstr "執行資訊"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "SSL req."
msgstr "SSL 要求"
@@ -333,26 +449,30 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "儲存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr "如果發生錯誤或域計數 &le; 0,傳送通知電子郵件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
"設定 nice 級別為“低優先順序”,adblock 後臺程序將從系統中獲取更少的資源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4')."
-msgstr "處理下載佇列的大小及並行處理列表(預設“4”)。"
+"parallel (default '8')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+msgid "Start Date"
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid "Startup Trigger"
msgstr "啟動觸發器"
@@ -366,13 +486,19 @@ msgstr "暫停"
msgid "Suspend / Resume Adblock"
msgstr "暫停/恢復 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
-"Target directory for adblock backups. Please use only non-volatile disks, e."
+"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
-msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+msgid ""
+"Target directory for dns related report files. Please use preferably a non-"
+"volatile disk, e.g. an external usb stick."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成攔截列表“adb_list.overall”的目標目錄。"
@@ -386,7 +512,7 @@ msgstr "檔案過大,無法使用 LuCI 的線上編輯(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系統日誌輸出,僅針對 adblock 相關的訊息進行了預篩選。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手動停止/重啟服務才能生效。"
@@ -412,45 +538,80 @@ msgid ""
"for whitelisting."
msgstr "此表單允許您查詢某些域的活動塊列表,例如用於列出白名單。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
+msgid "Time"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr "要覆蓋預設路徑,請使用下面額外部分中的“DNS 目錄”選項。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+msgid "Top 10 Reporting"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+msgid "Total DNS Queries"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Trigger Delay"
msgstr "觸發延遲"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Verbose Debug Logging"
msgstr "詳細的除錯記錄"
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
-msgid "View Logfile"
-msgstr "檢視日誌檔案"
-
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22
msgid "Waiting for command to complete..."
msgstr "正在等待指令完成…"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
+msgid "Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Whitelist File"
msgstr "白名單檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid ""
-"You can use this restrictive blocklist manually e.g. for guest wifi or "
-"kidsafe configurations."
+"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+"configurations."
msgstr ""
-"您可以手動使用此限制性攔截列表,例如:為客人提供 wifi 或 kidsafe 配置。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
+
+#~ msgid ""
+#~ "Please note: this needs additional 'msmtp' package installation and setup."
+#~ msgstr "請注意:這需要額外的“msmtp”軟體包安裝和設定。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4')."
+#~ msgstr "處理下載佇列的大小及並行處理列表(預設“4”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only non-volatile disks, "
+#~ "e.g. an external usb stick."
+#~ msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+
+#~ msgid "View Logfile"
+#~ msgstr "檢視日誌檔案"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
+#~ "kidsafe configurations."
+#~ msgstr ""
+#~ "您可以手動使用此限制性攔截列表,例如:為客人提供 wifi 或 kidsafe 配置。"
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index 1920d6bb4..4c9ad6c18 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -7,7 +7,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
@@ -83,8 +83,8 @@ msgid ""
"Acceptable values: 1-100. This many Tracking IP addresses must respond for "
"the link to be deemed up"
msgstr ""
-"利用可能な値: 1-100。上記の追跡 IP の合計個数のうち、Up 状態と判定するために"
-"に必要な、レスポンスが返された追跡 IP アドレスの個数です。"
+"利用可能な値: 1-100。上記のトラッキング IP の合計個数のうち、Up 状態と判定す"
+"るためにに必要な、レスポンスが返されたトラッキング IP アドレスの個数です。"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:28
msgid "Acceptable values: 1-1000. Defaults to 1 if not set"
@@ -96,11 +96,12 @@ msgstr "利用可能な値: 1-256。空欄の場合のデフォルトは1です
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:177
msgid "All required IP rules for interface %s found"
-msgstr ""
+msgstr "インターフェース %s の全必須 IP ルールが見つかりました"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36
msgid "Also scan this Routing table for connected networks"
msgstr ""
+"接続されたネットワークのために、追加でスキャンするルーティングテーブルです。"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73
msgid "Check IP rules"
@@ -204,7 +205,7 @@ msgstr "ホットプラグ ifup"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24
msgid "How often should rtmon update the interface routing table"
-msgstr ""
+msgstr "rtmon がインターフェース ルーティングテーブルの更新を行う頻度です。"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56
@@ -363,7 +364,7 @@ msgstr ""
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69
msgid "Max TTL"
-msgstr ""
+msgstr "最大 TTL"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85
msgid "Max packet latency [ms]"
@@ -447,11 +448,11 @@ msgstr "MWAN インターフェースが見つかりません"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:159
msgid "No gateway for interface %s found."
-msgstr ""
+msgstr "インターフェース %s にゲートウェイが見つかりません。"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:168
msgid "No tracking Hosts for interface %s defined."
-msgstr ""
+msgstr "インターフェース %s にトラッキングホストが指定されていません。"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:60
msgid "Notification"
@@ -470,7 +471,7 @@ msgstr "オンライン"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:182
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:186
msgid "Only one IP rules for interface %s found"
-msgstr ""
+msgstr "インターフェース %s に IP ルールが一つのみ見つかりました。"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:45
msgid "Ping count"
@@ -478,7 +479,7 @@ msgstr "Ping 回数"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:71
msgid "Ping default gateway"
-msgstr "Ping デフォルト ゲートウェイ"
+msgstr "デフォルト ゲートウェイへのping"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
@@ -503,7 +504,7 @@ msgstr "Ping タイムアウト"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:72
msgid "Ping tracking IP"
-msgstr "Ping トラッキング IP"
+msgstr "トラッキング IP へのping"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:54
msgid "Policies"
@@ -550,19 +551,19 @@ msgstr "障害復旧 インターバル"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40
msgid "Routing table %d"
-msgstr ""
+msgstr "ルーティングテーブル %d"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196
msgid "Routing table %s for interface %s found"
-msgstr ""
+msgstr "ルーティングテーブル %s が見つかりました(インターフェース %s)"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:200
msgid "Routing table %s for interface %s not found"
-msgstr ""
+msgstr "ルーティングテーブル %s が見つかりません(インターフェース %s)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35
msgid "Routing table lookup"
-msgstr ""
+msgstr "ルーティングテーブルの検索"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58
msgid "Rule"
@@ -681,17 +682,17 @@ msgstr ""
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:30
msgid "Tracking hostname or IP address"
-msgstr "追跡ホスト名または IP アドレス"
+msgstr "トラッキング ホスト名または IP アドレス"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
msgid "Tracking method"
-msgstr "追跡方式"
+msgstr "トラッキング方式"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
msgid "Tracking reliability"
-msgstr "追跡の信頼性"
+msgstr "トラッキングの信頼性"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:41
msgid ""
@@ -711,7 +712,7 @@ msgstr "トラブルシューティング"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23
msgid "Update interval"
-msgstr ""
+msgstr "更新間隔"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31
msgid "View the content of /etc/protocols for protocol description"
@@ -735,8 +736,8 @@ msgid ""
"WARNING: Interface %s has a higher reliability requirement than tracking "
"hosts (%d)"
msgstr ""
-"警告: インターフェース %s は追跡ホスト数 (%d) よりも高い追跡信頼性の値が設定"
-"されています"
+"警告: インターフェース %s はトラッキング ホスト数 (%d) よりも高いトラッキング"
+"信頼性の値が設定されています"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:30
msgid "WARNING: Interface %s has no default route in the main routing table"
@@ -810,10 +811,3 @@ msgstr "never"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
msgid "unreachable (reject)"
msgstr "unreachable (reject)"
-
-#~ msgid ""
-#~ "Use the IP address of this interface as source IP address for traffic "
-#~ "initiated by the router itself"
-#~ msgstr ""
-#~ "ルーター自身によって発生するトラフィックのアクセス元 IP アドレスとして、こ"
-#~ "のインターフェースの IP アドレスが使用されます。"
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
index dea793239..6aaf1d2c2 100644
--- a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
@@ -48,7 +48,7 @@ o.optional = true
o.datatype = "port"
o.placeholder = "3493"
-s = m:section(NamedSection, "upsd", "upsd", translate("Global Settings"))
+s = m:section(NamedSection, "upsd", "upsd", translate("UPS Server Global Settings"))
s.addremove = true
o = s:option(Value, "maxage", translate("Maximum Age of Data"), translate("Period after which data is considered stale"))
@@ -74,6 +74,43 @@ if luci.util.checklib("/usr/sbin/upsd", "libssl.so") then
o.optional = true
end
+s = m:section(NamedSection, "driver_global", "driver_global", translate("Driver Global Settings"))
+s.addremove = true
+
+o = s:option(Value, "chroot", translate("chroot"), translate("Run drivers in a chroot(2) environment"))
+o.optional = true
+
+o = s:option(Value, "driverpath", translate("Driver Path"), translate("Path to drivers (instead of default)"))
+o.optional = true
+o.placeholder = "/lib/lnut"
+
+o = s:option(Value, "maxstartdelay", translate("Maximum Start Delay"), translate("Default for UPSes without this field."))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxretry", translate("Maxium Retries"), translate("Maximum number of times to try starting a driver."))
+o.optional = true
+o.placeholder = 1
+o.datatype = "uinteger"
+
+o = s:option(Value, "retrydelay", translate("Retry Delay"), translate("Time in seconds between driver start retry attempts."))
+o.optional = true
+o.placeholder = 5
+o.datatype = "uinteger"
+
+o = s:option(Value, "pollinterval", translate("Poll Interval"), translate("Maximum time in seconds between refresh of UPS status"))
+o.optional = true
+o.placeholder = 2
+o.datatype = "uinteger"
+
+o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more."))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "user", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver to be read-write for that user."))
+o.optional = true
+o.placeholder = "nut"
+
s = m:section(TypedSection, "driver", translate("Driver Configuration"),
translate("The name of this section will be used as UPS name elsewhere"))
s.addremove = true
@@ -81,15 +118,47 @@ s.anonymous = false
driverlist = nixio.fs.dir("/lib/nut")
+o = s:option(Value, "bus", translate("USB Bus(es) (regex)"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "community", translate("SNMP Community"))
+o.optional = true
+o.placeholder = "private"
+
+o = s:option(Value, "desc", translate("Description (Display)"))
+o.optional = true
+
o = s:option(ListValue, "driver", translate("Driver"))
for driver in driverlist do
o:value(driver)
end
o.optional = false
-o = s:option(Value, "port", translate("Port"))
-o.optional = false
-o.default = "auto"
+o = s:option(Flag, "enable_usb_serial", translate("Set USB serial port permissions"), translate("Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) group read-write as user 'nut'"))
+o.optional = true
+o.default = false
+
+o = s:option(Flag, "ignorelb", translate("Ignore Low Battery"))
+o.optional = true
+o.default = false
+
+o = s:option(Flag, "interruptonly", translate("Interrupt Only"))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxstartdelay", translate("Maxium Start Delay"), translate("Time in seconds that upsdrvctl will wait for driver to finish starting"))
+o.optional = true
+o.datatype = "uinteger"
+o.placeholder = 45
o = s:option(Value, "mfr", translate("Manufacturer (Display)"))
o.optional = true
@@ -97,11 +166,13 @@ o.optional = true
o = s:option(Value, "model", translate("Model (Display)"))
o.optional = true
-o = s:option(Value, "serial", translate("Serial Number"))
+o = s:option(Flag, "nolock", translate("No Lock"), translate("Don't lock port when starting driver"))
o.optional = true
+o.default = false
-o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)"))
+o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs"))
o.optional = true
+o.default = false
o = s:option(Value, "offdelay", translate("Off Delay(s)"), translate("Delay for kill power command"))
o.optional = true
@@ -128,42 +199,33 @@ o.optional = true
o.datatype = "integer"
o.placeholder = 30
-o = s:option(Value, "vendor", translate("Vendor (regex)"))
-o.optional = true
+o = s:option(Value, "port", translate("Port"))
+o.optional = false
+o.default = "auto"
o = s:option(Value, "product", translate("Product (regex)"))
o.optional = true
-o = s:option(Value, "bus", translate("USB Bus(es) (regex)"))
-o.optional = true
-o.datatype = "uinteger"
-
-o = s:option(Flag, "interruptonly", translate("Interrupt Only"))
-o.optional = true
-o.default = false
-
-o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe"))
+o = s:option(Value, "productid", translate("USB Product Id"))
o.optional = true
-o.datatype = "integer"
-o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware"))
+o = s:option(Value, "sdorder", translate("Driver Shutdown Order"))
o.optional = true
-o.datatype = "integer"
-o.default = nil
+o.datatype = "uinteger"
-o = s:option(Value, "vendorid", translate("USB Vendor Id"))
+o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)"))
o.optional = true
-o = s:option(Value, "productid", translate("USB Product Id"))
+o = s:option(Value, "serial", translate("Serial Number"))
o.optional = true
-o = s:option(Value, "runas", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver be read-write for that user."))
+o = s:option(Value, "snmp_retries", translate("SNMP retries"))
o.optional = true
-o.placeholder = "nut"
+o.datatype = "uinteger"
-o = s:option(Value, "community", translate("SNMP Community"))
+o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)"))
o.optional = true
-o.placeholder = "private"
+o.datatype = "uinteger"
o = s:option(ListValue, "snmp_version", translate("SNMP version"))
o.optional = true
@@ -173,19 +235,14 @@ o:value("v3", translate("SNMPv3"))
o:value("", "")
o.default = ""
-o = s:option(Value, "snmp_retries", translate("SNMP retries"))
+o = s:option(Value, "vendor", translate("Vendor (regex)"))
o.optional = true
-o.datatype = "uinteger"
-o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)"))
+o = s:option(Value, "vendorid", translate("USB Vendor Id"))
o.optional = true
-o.datatype = "uinteger"
-o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs"))
+o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more."))
o.optional = true
o.default = false
-o = s:option(Value, "other", translate("Additional Parameters"))
-o.optional = true
-
return m
diff --git a/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po
new file mode 100644
index 000000000..d6b84b913
--- /dev/null
+++ b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po
@@ -0,0 +1,326 @@
+msgid ""
+msgstr ""
+"Last-Translator: Yousong Zhou <yszhou4tech@gmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:170
+msgid "<hidden>"
+msgstr "<已隐藏>"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:14
+msgid "Add"
+msgstr "添加"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:24
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:32
+msgid "Bind address"
+msgstr "绑定地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:73
+msgid "Bypass ss-redir for packets with dst address in this list"
+msgstr "对于目的地址在列表中的报文,绕过ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:59
+msgid "Bypass ss-redir for packets with src address in this list"
+msgstr "对于源地址在列表中的报文,绕过ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:65
+msgid ""
+"Continue to have dst address checked for packets with src address in this "
+"list"
+msgstr "对于源地址在列表中的报文,继续检查其目的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:47
+msgid "Default action for locally generated TCP packets"
+msgstr "对于设备本身产生的TCP报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:88
+msgid ""
+"Default action for packets whose dst address do not match any of the dst ip "
+"list"
+msgstr "对于目的地址不在列表中的报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:68
+msgid ""
+"Default action for packets whose src address do not match any of the src ip/"
+"net list"
+msgstr "对于源地址不在列表中的报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:11
+msgid ""
+"Definition of remote shadowsocks servers. Disable any of them will also "
+"disable instances referring to it."
+msgstr "在此页面设定访问远端shadowsocks服务器的参数。请注意,禁用远端服务器会同时停止与之关联的shadowsocks-libev组件"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:33
+msgid "Destination Settings"
+msgstr "目的地址设定"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:25
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:35
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:28
+msgid "Disable"
+msgstr "禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:86
+msgid "Disabled"
+msgstr "已禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:87
+msgid "Dst default"
+msgstr "目的未匹配时默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:72
+msgid "Dst ip/net bypass"
+msgstr "绕过"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:79
+msgid "Dst ip/net bypass file"
+msgstr "绕过(文件)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:75
+msgid "Dst ip/net forward"
+msgstr "转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:83
+msgid "Dst ip/net forward file"
+msgstr "转发(文件)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:126
+msgid "Enable SO_REUSEPORT"
+msgstr "启用SO_REUSEPORT"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:124
+msgid "Enable TCP Fast Open"
+msgstr "启用TCP Fast Open"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:125
+msgid "Enable TCP_NODELAY"
+msgstr "启用TCP_NODELAY"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:83
+msgid "Enable/Disable"
+msgstr "启用/禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:89
+msgid "Enabled"
+msgstr "已启用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:54
+msgid "Extra arguments"
+msgstr "额外参数"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:80
+msgid ""
+"File containing ip/net for the purposes as with <em>Dst ip/net bypass</em>"
+msgstr "文件列出需要绕过ss-redir转发的地址和网段"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:84
+msgid ""
+"File containing ip/net for the purposes as with <em>Dst ip/net forward</em>"
+msgstr "文件列出需要使用ss-redir转发的地址和网段"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:106
+msgid "Forward recentrst"
+msgstr "转发被连接重置的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:107
+msgid ""
+"Forward those packets whose dst have recently sent to us multiple tcp-rst"
+msgstr "若近期多次收到某地址的连接重置报文,则将其加入到转发列表中"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:76
+msgid "Forward through ss-redir for packets with dst address in this list"
+msgstr "对于目的地址在列表中的报文,通过ss-redir转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:62
+msgid "Forward through ss-redir for packets with src address in this list"
+msgstr "对于源地址在列表中的报文,通过ss-redir转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:23
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:31
+msgid "General Settings"
+msgstr "常规设置"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123
+msgid "IPv6 First"
+msgstr "IPv6优先"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:50
+msgid "Ingress interfaces"
+msgstr "入口网卡"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:197
+msgid "Install package %q"
+msgstr "安装%q"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:97
+msgid "Install package iptables-mod-conntrack-extra"
+msgstr "安装iptables-mod-conntrack-extra"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:11
+msgid ""
+"Instances of shadowsocks-libev components, e.g. ss-local, ss-redir, ss-"
+"tunnel, ss-server, etc. To enable an instance it is required to enable both "
+"the instance itself and the remote server it refers to."
+msgstr "此页面展示本地运行的shadowsocks-libev各组件实例,如ss-local、ss-redir、ss-tunnel、ss-server等。请注意,实际启用一个实例要求实例本身及所关联的远端服务器都是启用状态。"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:99
+msgid "Key (base64 encoding)"
+msgstr "密钥(base64编码)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:13
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:10
+msgid "Local Instances"
+msgstr "本地实例"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:71
+msgid "Local address"
+msgstr "监听地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:75
+msgid "Local port"
+msgstr "监听端口"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:46
+msgid "Local-out default"
+msgstr "本地报文默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:116
+msgid "MTU"
+msgstr ""
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:95
+msgid "Method"
+msgstr "加密方法"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:111
+msgid "Mode of operation"
+msgstr "工作模式"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:76
+#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:12
+msgid "Name"
+msgstr "名称"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:10
+msgid ""
+"On this page you can configure how traffics are to be forwarded to ss-redir "
+"instances. If enabled, packets will first have their src ip addresses "
+"checked against <em>Src ip/net bypass</em>, <em>Src ip/net forward</em>, "
+"<em>Src ip/net checkdst</em> and if none matches <em>Src default</em> will "
+"give the default action to be taken. If the prior check results in action "
+"<em>checkdst</em>, packets will continue to have their dst addresses checked."
+msgstr "在此页面,您可以配置指定报文是否通过ss-redir转发。启用后,规则会先将报文的源地址与相应的地址集进行匹配,依次决定是否“绕过(<em>bypass</em>)”、“转发(<em>forward</em>)”,或“继续匹配目的地址(<em>checkdst</em>)”;若未在集合中找到匹配,则执行指定的默认动作。继续匹配目的地址时同理。"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:51
+msgid "Only apply rules on packets from these network interfaces"
+msgstr "仅对来自指定网卡的报文应用规则"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:78
+msgid "Overview"
+msgstr "概览"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:196
+msgid "Package is not installed"
+msgstr "依赖包未安装"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:55
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "给iptables的额外参数。请小心使用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:103
+msgid "Password"
+msgstr "密码"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123
+msgid "Prefer IPv6 addresses when resolving names"
+msgstr "名字解析时优先取用IPv6地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:21
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:9
+msgid "Redir Rules"
+msgstr "转发规则"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:17
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:10
+msgid "Remote Servers"
+msgstr "远端服务器"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:69
+msgid "Remote server"
+msgstr "服务器"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:120
+msgid "Run as"
+msgstr "运行时用户"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:81
+msgid "Running"
+msgstr "运行中"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:89
+msgid "Server"
+msgstr "监听地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:92
+msgid "Server port"
+msgstr "监听端口"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:9
+msgid "Shadowsocks-libev"
+msgstr ""
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:32
+msgid "Source Settings"
+msgstr "源地址设定"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:67
+msgid "Src default"
+msgstr "源未匹配默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:58
+msgid "Src ip/net bypass"
+msgstr "绕过"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:64
+msgid "Src ip/net checkdst"
+msgstr "继续匹配目的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:61
+msgid "Src ip/net forward"
+msgstr "转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:33
+msgid "The address ss-server will initiate connection from"
+msgstr "ss-server建立连接时使用的源地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:42
+msgid "The address ss-tunnel will forward traffic to"
+msgstr "ss-tunnel所建立隧道的对端地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:118
+msgid "Timeout (sec)"
+msgstr "超时时间(秒)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:41
+msgid "Tunnel address"
+msgstr "隧道对端地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:122
+msgid "Verbose"
+msgstr "记录详细日志"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:39
+msgid "ss-redir for TCP"
+msgstr "用于TCP转发的ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:42
+msgid "ss-redir for UDP"
+msgstr "用于UDP转发的ss-redir"
diff --git a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
index 883e1bb63..eadf9b572 100644
--- a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
+++ b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
@@ -42,7 +42,7 @@ function lhttp.validate(self, value, section)
end
end
if not (have_http_listener or have_https_listener) then
- return nil, "must listen on at list one address:port"
+ return nil, "must listen on at least one address:port"
end
return DynamicList.validate(self, value, section)
end
@@ -78,7 +78,7 @@ function lhttps.validate(self, value, section)
end
end
if not (have_http_listener or have_https_listener) then
- return nil, "must listen on at list one address:port"
+ return nil, "must listen on at least one address:port"
end
return DynamicList.validate(self, value, section)
end
diff --git a/applications/luci-app-wifischedule/po/de/wifischedule.po b/applications/luci-app-wifischedule/po/de/wifischedule.po
new file mode 100644
index 000000000..4addd0918
--- /dev/null
+++ b/applications/luci-app-wifischedule/po/de/wifischedule.po
@@ -0,0 +1,101 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Activate wifi"
+msgstr "WLAN aktivieren"
+
+msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi"
+msgstr "Konnte /usr/bin/wifi_schedule.sh oder /sbin/wifi nicht finden"
+
+msgid "Could not find required programm /usr/bin/iwinfo"
+msgstr "Konnte /usr/bin/iwinfo nicht finden"
+
+msgid "Cron Jobs"
+msgstr ""
+
+msgid "Day(s) of Week"
+msgstr "Wochentag(e)"
+
+msgid "Defines a schedule when to turn on and off wifi."
+msgstr "Definiert einen Zeitplan, wann das WLAN ein- und ausgeschaltet werden soll"
+
+msgid "Determine Modules Automatically"
+msgstr "Module automatisch ermitteln"
+
+msgid "Disable wifi gracefully"
+msgstr "Wifi ordnungsgemäß deaktivieren"
+
+msgid "Disabled wifi forced"
+msgstr "Wifi abrupt deaktivieren"
+
+msgid "Enable"
+msgstr "Aktivieren"
+
+msgid "Enable Wifi Schedule"
+msgstr "Wifi-Zeitschaltung aktivieren"
+
+msgid "Enable logging"
+msgstr "Protokollierung aktivieren"
+
+msgid "Force disabling wifi even if stations associated"
+msgstr "Deaktivieren des WLANs auch bei verbundenen Stationen"
+
+msgid "Friday"
+msgstr "Freitag"
+
+msgid "Global Settings"
+msgstr "Globale Einstellungen"
+
+msgid "Monday"
+msgstr "Montag"
+
+msgid "Saturday"
+msgstr "Samstag"
+
+msgid "Schedule"
+msgstr "Zeitschaltung"
+
+msgid "Schedule events"
+msgstr "Ereignisse planen"
+
+msgid "Start Time"
+msgstr "Startzeit"
+
+msgid "Start WiFi"
+msgstr "WiFi starten"
+
+msgid "Stop Time"
+msgstr "Stoppzeit"
+
+msgid "Stop WiFi"
+msgstr "WiFi stoppen"
+
+msgid "Sunday"
+msgstr "Sonntag"
+
+msgid "The value %s is invalid"
+msgstr "Der Wert %s ist ungültig"
+
+msgid "Thursday"
+msgstr "Donnerstag"
+
+msgid "Tuesday"
+msgstr "Dienstag"
+
+msgid "Unload Modules (experimental; saves more power)"
+msgstr "Module entladen (experimentell - spart mehr Energie)"
+
+msgid "View Cron Jobs"
+msgstr "Cron-Jobs anzeigen"
+
+msgid "View Logfile"
+msgstr "Protokolldatei anzeigen"
+
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+msgid "Wifi Schedule"
+msgstr "Wifi-Zeitschaltung"
+
+msgid "Wifi Schedule Logfile"
+msgstr "Protokolldatei für Wifi-Zeitschaltung"
diff --git a/contrib/package/csstidy/Makefile b/contrib/package/csstidy/Makefile
index 419d50719..83f8f0802 100644
--- a/contrib/package/csstidy/Makefile
+++ b/contrib/package/csstidy/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/csstidy-cpp.git
-PKG_SOURCE_DATE:=2018-12-12.1
-PKG_SOURCE_VERSION:=33594b4783cc944da8197b2209c2a47af3aa42a4
-PKG_MIRROR_HASH:=3c9ba0c244e850bb897e08cb1c96d4e861a93a8a26871b5a0d54cf88c60422f5
+PKG_SOURCE_DATE:=2018-12-20
+PKG_SOURCE_VERSION:=1d5620149ae35c0d49fb2014d4e63a23ecfb6f69
+PKG_MIRROR_HASH:=3210d475f6ae966d4dfcd3e1f7fcbf0ad9507a37878d50de015ffe795c1d160e
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING
diff --git a/libs/luci-lib-jsonc/src/jsonc.c b/libs/luci-lib-jsonc/src/jsonc.c
index ef1110166..9ff8520db 100644
--- a/libs/luci-lib-jsonc/src/jsonc.c
+++ b/libs/luci-lib-jsonc/src/jsonc.c
@@ -27,6 +27,12 @@ limitations under the License.
#define LUCI_JSONC "luci.jsonc"
#define LUCI_JSONC_PARSER "luci.jsonc.parser"
+struct seen {
+ size_t size;
+ size_t len;
+ const void *ptrs[];
+};
+
struct json_state {
struct json_object *obj;
struct json_tokener *tok;
@@ -35,6 +41,7 @@ struct json_state {
static void _json_to_lua(lua_State *L, struct json_object *obj);
static struct json_object * _lua_to_json(lua_State *L, int index);
+static struct json_object * _lua_to_json_rec(lua_State *L, int index, struct seen **seen);
static int json_new(lua_State *L)
{
@@ -199,6 +206,9 @@ static int _lua_test_array(lua_State *L, int index)
int max = 0;
lua_Number idx;
+ if (!lua_checkstack(L, 2))
+ return -1;
+
lua_pushnil(L);
/* check for non-integer keys */
@@ -243,16 +253,54 @@ out:
return max;
}
-static struct json_object * _lua_to_json(lua_State *L, int index)
+
+static bool visited(struct seen **sp, const void *ptr) {
+ struct seen *s = *sp;
+ size_t i;
+
+ if (s->len >= s->size)
+ {
+ i = s->size + 10;
+ s = realloc(*sp, sizeof(struct seen) + sizeof(void *) * i);
+
+ if (!s)
+ {
+ if (*sp)
+ free(*sp);
+
+ *sp = NULL;
+ return true;
+ }
+
+ s->size = i;
+ *sp = s;
+ }
+
+ for (i = 0; i < s->len; i++)
+ if (s->ptrs[i] == ptr)
+ return true;
+
+ s->ptrs[s->len++] = ptr;
+ return false;
+}
+
+static struct json_object * _lua_to_json_rec(lua_State *L, int index,
+ struct seen **seen)
{
lua_Number nd, ni;
struct json_object *obj;
const char *key;
int i, max;
+ if (index < 0)
+ index = lua_gettop(L) + index + 1;
+
switch (lua_type(L, index))
{
case LUA_TTABLE:
+ if (visited(seen, lua_topointer(L, index)))
+ return NULL;
+
max = _lua_test_array(L, index);
if (max >= 0)
@@ -262,12 +310,15 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
if (!obj)
return NULL;
+ if (!lua_checkstack(L, 1))
+ return NULL;
+
for (i = 1; i <= max; i++)
{
lua_rawgeti(L, index, i);
json_object_array_put_idx(obj, i - 1,
- _lua_to_json(L, lua_gettop(L)));
+ _lua_to_json_rec(L, -1, seen));
lua_pop(L, 1);
}
@@ -280,6 +331,9 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
if (!obj)
return NULL;
+ if (!lua_checkstack(L, 3))
+ return NULL;
+
lua_pushnil(L);
while (lua_next(L, index))
@@ -289,7 +343,7 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
if (key)
json_object_object_add(obj, key,
- _lua_to_json(L, lua_gettop(L) - 1));
+ _lua_to_json_rec(L, -2, seen));
lua_pop(L, 2);
}
@@ -318,6 +372,23 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
return NULL;
}
+static struct json_object * _lua_to_json(lua_State *L, int index)
+{
+ struct seen *s = calloc(sizeof(struct seen) + sizeof(void *) * 10, 1);
+ struct json_object *rv;
+
+ if (!s)
+ return NULL;
+
+ s->size = 10;
+
+ rv = _lua_to_json_rec(L, index, &s);
+
+ free(s);
+
+ return rv;
+}
+
static int json_parse_set(lua_State *L)
{
struct json_state *s = luaL_checkudata(L, 1, LUCI_JSONC_PARSER);
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 8e269a5b1..8fff42553 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2018-12-20 03:00+0900\n"
+"PO-Revision-Date: 2018-12-26 19:48+0900\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Language-Team: \n"
"Language: ja\n"
@@ -1499,7 +1499,7 @@ msgstr "切断の試行が失敗しました"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
msgid "Dismiss"
-msgstr "警告の除去"
+msgstr "閉じる"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:239
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:333
@@ -4996,9 +4996,8 @@ msgstr ""
"未適用の変更を適用後、デバイスは %d 秒以内に完了できなかった可能性がありま"
"す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ"
"でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ"
-"い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う"
-"か、現在動作している設定状況を維持するために未適用の変更を取り消してくださ"
-"い。"
+"い。もしくは、再度適用を試行する前にこの警告を閉じて設定内容の編集を行うか、"
+"現在動作している設定状況を維持するために未適用の変更を取り消してください。"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:87
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:41
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 3328c5337..fe6ccc6e4 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -3581,7 +3581,7 @@ msgstr "在DHCP回應中覆蓋匝道器"
msgid ""
"Override the netmask sent to clients. Normally it is calculated from the "
"subnet that is served."
-msgstr "覆蓋傳送到客戶端的網路遮罩. 正常來說它會計算來自魚已存子網路."
+msgstr "覆蓋傳送到客戶端的子網路遮罩. 正常來說它會計算來自於已存在的子網路."
#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
msgid "Override the table used for internal routes"
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index dc5691136..8c6f68110 100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -571,7 +571,7 @@ header > .fill > .container > .status > * {
display: block;
padding: .5rem 1rem;
text-decoration: none;
- color: #202124;
+ color: var(--menu-color);
}
.main > .main-left > .nav > li:hover,