summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-adblock
diff options
context:
space:
mode:
authorINAGAKI Hiroshi <musashino.open@gmail.com>2019-08-21 23:07:14 +0900
committerINAGAKI Hiroshi <musashino.open@gmail.com>2019-08-21 23:07:14 +0900
commit4b40b0d6fc4319624497da2b0c14e5974bfc5e0e (patch)
treed7fb4f46bd503874fb40ccff525b2f17fbc69758 /applications/luci-app-adblock
parent2aab85814d0eead5f82ee1c5661f03667ce50b62 (diff)
i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Diffstat (limited to 'applications/luci-app-adblock')
-rw-r--r--applications/luci-app-adblock/po/es/adblock.po418
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po301
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po408
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po378
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po331
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po301
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot291
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po386
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po386
9 files changed, 1977 insertions, 1223 deletions
diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index 08c8fd03b0..d7164c7213 100644
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -12,11 +12,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Creación de listas de bloqueo 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -34,15 +30,15 @@ msgstr "Acción"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Estado de Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Version"
msgstr "Versión de Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Demora adicional del disparador en segundos antes de que comience el "
@@ -57,22 +53,23 @@ msgstr "Avanzado"
msgid "Answer"
msgstr "Responder"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "Categorías de archivo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "Directorio de respaldo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "Lista negra"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "Consultas DNS bloqueadas"
@@ -82,7 +79,7 @@ msgstr "Consultas DNS bloqueadas"
msgid "Blocked Domain"
msgstr "Dominio bloqueado"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fuentes de lista de bloqueo"
@@ -90,16 +87,7 @@ msgstr "Fuentes de lista de bloqueo"
msgid "Blocklist not found!"
msgstr "Lista de bloqueo no encontrado!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
-"acceso a todos los dominios, excepto los que figuran en el archivo de la "
-"lista blanca."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -133,44 +121,49 @@ msgstr ""
msgid "Count"
msgstr "Contar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en modo de copia de "
-"seguridad."
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS Backend (Directorio DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Directorio DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr "Informe de consulta de DNS"
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr "Fecha"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descripción"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"copias de seguridad de listas de bloqueo en su lugar."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -183,14 +176,38 @@ msgstr "Dominio"
msgid "Domain/Client/Date/Time"
msgstr "Dominio/Cliente/Fecha/Hora"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Utilidad de descarga"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "Utilidad de descarga (Biblioteca SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Editar lista negra"
@@ -203,33 +220,17 @@ msgstr "Editar configuración"
msgid "Edit Whitelist"
msgstr "Editar lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificación por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Recuento de notificaciones por Email"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Habilitar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista bloqueada"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "Habilitar informe de consulta de DNS"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilita el registro de depuración detallado en caso de cualquier error de "
"procesamiento."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Habilitado"
@@ -237,7 +238,7 @@ msgstr "Habilitado"
msgid "End Date"
msgstr "Fecha final"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opciones extra"
@@ -253,11 +254,11 @@ msgstr ""
"Filtrar el conjunto de resultados de la consulta de DNS para un dominio, "
"cliente o período de tiempo en particular."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "Vaciar caché de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "Vaciar el caché de DNS después del procesamiento de adblock."
@@ -269,7 +270,7 @@ msgstr ""
"Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
"documentación en línea</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -277,15 +278,19 @@ msgstr ""
"Para otras mejoras de rendimiento, puede aumentar este valor, por ejemplo, "
"'8' o '16' deben ser seguros."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Forzar DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "Ruta completa al archivo de la lista blanca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -299,7 +304,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Archivo de entrada no encontrado, por favor revise su configuración."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "Último inicio"
@@ -307,7 +312,7 @@ msgstr "Último inicio"
msgid "Latest DNS Queries"
msgstr "Últimas consultas de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -322,14 +327,20 @@ msgstr ""
"Lista de backends DNS admitidos con su directorio de exportación de lista "
"predeterminado."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"Lista de utilidades de descarga totalmente preconfiguradas y compatibles."
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "Cargando"
@@ -337,11 +348,15 @@ msgstr "Cargando"
msgid "Logfile"
msgstr "Archivo de registro"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "Servicio con prioridad baja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Cola máxima de descarga"
@@ -350,18 +365,18 @@ msgstr "Cola máxima de descarga"
msgid "Name / IP-Address"
msgstr "Nombre / Dirección IP"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opciones para ajustes adicionales en caso de que los valores predeterminados "
"no sean adecuados para usted."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "Dominios generales"
@@ -385,13 +400,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Por favor, edite este archivo directamente en una sesión de terminal."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
"Tenga en cuenta: esto necesita la instalación y configuración del paquete "
"'msmtp' manual."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
"Tenga en cuenta: esto necesita la instalación manual del paquete 'tcpdump-"
@@ -405,31 +420,30 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Dominios de consulta"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"Aumente el recuento mínimo de notificaciones por correo electrónico para "
-"obtener correos electrónicos si el recuento general es menor o igual al "
-"límite dado (valor predeterminado 0),"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"Redirije todas las consultas de DNS de la zona 'lan' a la resolución local, "
-"aplíquelas a los protocolos udp y tcp en los puertos 53, 853 y 5353."
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr "Refrescar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr "Actualizar las fuentes de la lista de bloqueo"
@@ -437,38 +451,38 @@ msgstr "Actualizar las fuentes de la lista de bloqueo"
msgid "Refresh Report"
msgstr "Informe de actualización"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr "Informe de recuento de fragmentos"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr "Tamaño del fragmento de informe"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "Directorio de informes"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr "Interfaz de informe"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr "Informe escuchar puerto(s)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
"Informe de recuento de fragmentos utilizado por tcpdump (por defecto '5')."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
"Informe el tamaño del fragmento utilizado por tcpdump en MB (valor "
"predeterminado '1')."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -476,15 +490,21 @@ msgstr ""
"Interfaz de informes utilizada por tcpdump, establecida en 'any' para "
"múltiples interfaces (por defecto 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Reanudar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "Información en tiempo de ejecución"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Requerimiento de SSL"
@@ -494,15 +514,17 @@ msgstr "Requerimiento de SSL"
msgid "Save"
msgstr "Guardar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-"Envía Emails de notificación en caso de un error de procesamiento o si el "
-"recuento de dominios es &le; 0."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -510,15 +532,13 @@ msgstr ""
"Establezca el nivel agradable en 'prioridad baja' y el procesamiento en "
"segundo plano de Adblock tomará menos recursos del sistema."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-"Tamaño de la cola de descarga para manejar descargas &amp; procesamiento de "
-"listas en paralelo (por defecto '8')."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -529,37 +549,33 @@ msgstr ""
msgid "Start Date"
msgstr "Fecha de inicio"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Disparador de inicio"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "Suspender"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Reanudar Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"Directorio de destino para las copias de seguridad de Adblock. Utilice solo "
-"un disco no volátil, por ejemplo, una memoria usb externa."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"Directorio de destino para los archivos de informes relacionados con DNS. "
-"Utilice preferiblemente un disco no volátil, por ej. una memoria usb externa."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
"Directorio de destino para la lista de bloqueo generada 'adb_list.overall'."
@@ -577,11 +593,11 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
"La salida de syslog, prefiltrada solo para mensajes relacionados con adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
"Este cambio requiere una parada/reinicio manual del servicio para que tenga "
@@ -617,6 +633,12 @@ msgstr ""
"Este formulario le permite consultar listas de bloqueo activas para ciertos "
"dominios, por ejemplo, para la lista blanca."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -634,15 +656,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "Top 10 de informes"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "Total de consultas de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Retraso de disparo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registro de depuración detallado"
@@ -654,26 +680,116 @@ msgstr "Esperando que el comando se complete..."
msgid "Whitelist"
msgstr "Lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Archivo de lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Si"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr ""
-"Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
-"configuraciones de wifi de invitados o para niños."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"P.ej. para recibir una notificación por email con cada actualización de "
-"Adblock, establezca este valor en 150000."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
+
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Creación de listas de bloqueo 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
+#~ "acceso a todos los dominios, excepto los que figuran en el archivo de la "
+#~ "lista blanca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en modo de copia de "
+#~ "seguridad."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "copias de seguridad de listas de bloqueo en su lugar."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificación por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Recuento de notificaciones por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista bloqueada"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "Habilitar informe de consulta de DNS"
+
+#~ 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 ""
+#~ "Aumente el recuento mínimo de notificaciones por correo electrónico para "
+#~ "obtener correos electrónicos si el recuento general es menor o igual al "
+#~ "límite dado (valor predeterminado 0),"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "Redirije todas las consultas de DNS de la zona 'lan' a la resolución "
+#~ "local, aplíquelas a los protocolos udp y tcp en los puertos 53, 853 y "
+#~ "5353."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Envía Emails de notificación en caso de un error de procesamiento o si el "
+#~ "recuento de dominios es &le; 0."
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr ""
+#~ "Tamaño de la cola de descarga para manejar descargas &amp; procesamiento "
+#~ "de listas en paralelo (por defecto '8')."
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de Adblock. Utilice "
+#~ "solo un disco no volátil, por ejemplo, una memoria usb externa."
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para los archivos de informes relacionados con DNS. "
+#~ "Utilice preferiblemente un disco no volátil, por ej. una memoria usb "
+#~ "externa."
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr ""
+#~ "Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
+#~ "configuraciones de wifi de invitados o para niños."
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "P.ej. para recibir una notificación por email con cada actualización de "
+#~ "Adblock, establezca este valor en 150000."
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 9ea78f2c0e..dcb742f5d2 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -11,11 +11,7 @@ msgstr ""
"X-Generator: Poedit 2.0.3\n"
"Language: it\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -31,15 +27,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Status Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
@@ -52,22 +48,23 @@ msgstr "Avanzato"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "Directory del Backup"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -77,7 +74,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fonti lista di Blocco"
@@ -85,13 +82,7 @@ msgstr "Fonti lista di Blocco"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-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:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -124,41 +115,49 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Directory DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descrizione"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"Non aggiornare automaticamente le liste durante l'avvio, usa invece i backup "
-"della lista di blocco."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -171,14 +170,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Modifica Lista Nera"
@@ -191,32 +214,16 @@ msgstr "Modifica Configurazione"
msgid "Edit Whitelist"
msgstr "Modifica Lista Bianca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Attiva Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Attiva Backup Lista di Blocco"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
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:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Abilitato"
@@ -224,7 +231,7 @@ msgstr "Abilitato"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opzioni Extra"
@@ -238,11 +245,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -252,21 +259,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
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:116
msgid "Force Local DNS"
msgstr "Forza DNS Locale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -278,7 +289,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "File di input non trovato, per favore controlla la tua configurazione."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "Ultimo Avvio"
@@ -286,7 +297,7 @@ msgstr "Ultimo Avvio"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -297,13 +308,19 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "Caricando"
@@ -311,11 +328,15 @@ msgstr "Caricando"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -324,18 +345,18 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opzioni per ulteriori modifiche in caso che quelle di default non ti sono "
"adatte."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr ""
@@ -359,11 +380,11 @@ 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:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -375,26 +396,30 @@ msgstr "Interrogazione"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails 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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -402,49 +427,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Riprendi"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "Informazione di Runtime"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Ric. SSL"
@@ -454,25 +485,29 @@ msgstr "Ric. SSL"
msgid "Save"
msgstr "Salva"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -481,33 +516,33 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Innesco d'Avvio"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "Sospendi"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Sospendi / Riprendi Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
@@ -521,11 +556,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -555,6 +590,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:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -572,15 +613,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Ritardo Innesco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registro di Debug Dettagliato"
@@ -592,25 +637,29 @@ msgstr "Aspettando che il comando venga completato..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Sì"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Non aggiornare automaticamente le liste durante l'avvio, usa invece i "
+#~ "backup della lista di blocco."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Attiva Backup Lista di Blocco"
#~ msgid "Force Overall Sort"
#~ msgstr "Forza Ordinamento Globale"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 74efb52dff..fb8bb3c6e3 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -11,11 +11,7 @@ msgstr ""
"X-Generator: Poedit 2.2.1\n"
"Language: ja\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Jail' ブロックリストの作成"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -33,15 +29,15 @@ msgstr "アクション"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Adblock ステータス"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Adblock の処理が開始されるまでの、追加の遅延時間(秒)です。"
@@ -54,22 +50,23 @@ msgstr "詳細設定"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "アーカイブ カテゴリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "バックアップ先 ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "バックアップ モード"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "ブラックリスト"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "ブロックされた DNS クエリ"
@@ -79,7 +76,7 @@ msgstr "ブロックされた DNS クエリ"
msgid "Blocked Domain"
msgstr "ブロックされたドメイン"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "ブロックリスト提供元"
@@ -87,15 +84,7 @@ msgstr "ブロックリスト提供元"
msgid "Blocklist not found!"
msgstr "ブロックリストが見つかりません!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の "
-"'Jail' リスト (/tmp/adb_list.jail) を作成します。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -129,44 +118,49 @@ msgstr ""
msgid "Count"
msgstr "カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS ディレクトリ"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr "DNS クエリ レポート"
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "説明"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"サービス起動時にブロックリストを自動的に更新せず、代わりにバックアップされた"
-"ブロックリストを使用します。"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -179,14 +173,38 @@ msgstr "ドメイン"
msgid "Domain/Client/Date/Time"
msgstr "ドメイン / クライアント / 日付 / 時刻"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "ブラックリストの編集"
@@ -199,32 +217,16 @@ msgstr "設定の編集"
msgid "Edit Whitelist"
msgstr "ホワイトリストの編集"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "メール通知"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "メール通知カウント"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Adblock の有効化"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "ブロックリスト バックアップの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "DNS クエリ レポートの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"何らかの処理エラーが発生した場合に、詳細なデバッグ ログを有効にします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "有効"
@@ -232,7 +234,7 @@ msgstr "有効"
msgid "End Date"
msgstr "終了日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "拡張オプション"
@@ -248,11 +250,11 @@ msgstr ""
"DNS クエリの結果セットを、指定したドメインやクライアント、日時によってフィル"
"タします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "DNS キャッシュのクリア"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
@@ -264,7 +266,7 @@ msgstr ""
"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
"確認してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -272,15 +274,19 @@ 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:116
msgid "Force Local DNS"
msgstr "ローカル DNS の強制"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "ホワイトリスト ファイルへのフルパスです。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -294,7 +300,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "入力ファイルが見つかりません。設定を確認してください。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "最終実行"
@@ -302,7 +308,7 @@ msgstr "最終実行"
msgid "Latest DNS Queries"
msgstr "最新の DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -317,13 +323,19 @@ msgstr ""
"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で"
"す。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "読込中"
@@ -331,11 +343,15 @@ msgstr "読込中"
msgid "Logfile"
msgstr "ログファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低優先度サービス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "ダウンロード キューの上限"
@@ -344,16 +360,16 @@ msgstr "ダウンロード キューの上限"
msgid "Name / IP-Address"
msgstr "名前 / IP アドレス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "いいえ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "全体のドメイン"
@@ -377,13 +393,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "ターミナル セッションで直接このファイルを編集してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
"注意: これは手動での 'msmtp' パッケージのインストールとセットアップを必要とし"
"ます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
"注意: これは手動での 'tcpdump-mini' パッケージのインストールを必要とします。"
@@ -396,30 +412,30 @@ msgstr "検索"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ"
-"は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr "リフレッシュ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr "ブロックリスト提供元のリフレッシュ"
@@ -427,35 +443,35 @@ msgstr "ブロックリスト提供元のリフレッシュ"
msgid "Refresh Report"
msgstr "レポートをリフレッシュ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr "レポート チャンクカウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr "レポート チャンクサイズ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "レポート ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr "レポート インターフェース"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr "レポート待ち受けポート"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump により使用される、レポートチャンク数です。(規定値: '5')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
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:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -463,15 +479,21 @@ msgstr ""
"tcpdump により使用される、レポートを行うインターフェースです。複数のインター"
"フェースを使用するには、 'any' を設定してください。(規定値: 'br-lan')"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "再開"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "実行情報"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 必須"
@@ -481,14 +503,17 @@ msgstr "SSL 必須"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -496,15 +521,13 @@ msgstr ""
"nice値(優先度)を '低優先度' に設定し、adblock バックグラウンド処理のシステ"
"ムリソース使用量を抑制します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-"ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ"
-"ズです。(規定値: '8')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -515,37 +538,33 @@ msgstr ""
msgid "Start Date"
msgstr "開始日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "スタートアップ トリガ"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "一時停止"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Adblock の一時停止 / 再開"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用して"
-"ください。(例: 外部 USB スティック)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
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:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成されたブロックリスト 'adb_list.overall' の保存先ディレクトリです。"
@@ -561,11 +580,11 @@ 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:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。"
@@ -599,6 +618,12 @@ msgstr ""
"このフォームでは、現在有効なリスト内で特定のドメインを検索することができま"
"す。例: ホワイトリスト内"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -616,15 +641,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "上位 10 レポート"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "総 DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "トリガ遅延"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "詳細なデバッグ ログ"
@@ -636,25 +665,110 @@ msgstr "コマンド実行中です..."
msgid "Whitelist"
msgstr "ホワイトリスト"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "ホワイトリスト ファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "はい"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"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
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
+
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "'Jail' ブロックリストの作成"
+
+#~ msgid "Backup Mode"
+#~ msgstr "バックアップ モード"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の "
+#~ "'Jail' リスト (/tmp/adb_list.jail) を作成します。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "圧縮されたブロックリストのバックアップを作成します。これは、リストのダウン"
+#~ "ロードがエラーの場合、またはバックアップ モードでサービスを起動した場合に"
+#~ "使用されます。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "サービス起動時にブロックリストを自動的に更新せず、代わりにバックアップされ"
+#~ "たブロックリストを使用します。"
+
+#~ msgid "Email Notification"
+#~ msgstr "メール通知"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "メール通知カウント"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "ブロックリスト バックアップの有効化"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "DNS クエリ レポートの有効化"
+
+#~ 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 ""
+#~ "メール通知を行うメール通知カウントの下限値を設定します。全体カウントが指定"
+#~ "された値以下の場合、メールを受け取ります(規定値: 0)。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。こ"
+#~ "れは、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr ""
+#~ "ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサ"
+#~ "イズです。(規定値: '8')"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用し"
+#~ "てください。(例: 外部 USB スティック)"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "DNS 関連レポートファイルの保存先ディレクトリです。可能であれば不揮発性ディ"
+#~ "スクを使用してください。(例: 外部 USB スティック)"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr ""
+#~ "この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに"
+#~ "手動で利用することができます。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index e0d2d790fe..539d32a773 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -12,11 +12,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Enjaule' Criação de Lista Negra"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -34,15 +30,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Estado do Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Atraso de gatilho adicional em segundos antes do processamento do adblock "
@@ -57,22 +53,23 @@ msgstr "Avançado"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "Categorias Arquivadas"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de Backup"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -82,7 +79,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fontes de listas de bloqueio"
@@ -90,15 +87,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:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-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:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -132,44 +121,49 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
-"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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Diretório DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
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/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -182,14 +176,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "Utilitário de Download (Biblioteca SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Editar Lista de Bloqueio"
@@ -202,33 +220,17 @@ msgstr "Editar Configuração"
msgid "Edit Whitelist"
msgstr "Editar Lista Permitida"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificação por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Quantidade para Notificação por Email"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Habilitar adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-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:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
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:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Habilitado"
@@ -236,7 +238,7 @@ msgstr "Habilitado"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opções adicionais"
@@ -250,11 +252,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "Limpar cache DNS depois do processamento do adblock."
@@ -266,7 +268,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:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -274,15 +276,19 @@ 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:116
msgid "Force Local DNS"
msgstr "Force o DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
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:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -294,7 +300,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Arquivo de entrada não encontrado, por favor cheque sua configuração."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "Última Execução"
@@ -302,7 +308,7 @@ msgstr "Última Execução"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -317,13 +323,19 @@ 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:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "Carregando"
@@ -331,11 +343,15 @@ msgstr "Carregando"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "Serviço de Baixa Prioridade"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Tamanho Máximo da Fila"
@@ -344,18 +360,18 @@ msgstr "Tamanho Máximo da Fila"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Não"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opções para aprimoramentos adicionais caso as opções padrão não sejam "
"suficientes para você."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "Domínios Globais"
@@ -379,11 +395,11 @@ 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:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -395,30 +411,30 @@ msgstr "Consulta"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"Redirecione todas as requisições DNS da zona 'LAN' para o servidor local. "
-"Aplica-se aos protocolos UDP e TCP nas portas 53, 853 e 5353."
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr "Atualizar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr "Atualizar as Fontes de Lista Negra"
@@ -426,49 +442,55 @@ msgstr "Atualizar as Fontes de Lista Negra"
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Continuar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "Informação de execução"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Req. de SSL"
@@ -478,15 +500,17 @@ msgstr "Req. de SSL"
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -494,13 +518,15 @@ 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:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
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:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -509,33 +535,33 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Gatilho de Iniciação"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "Suspender"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Resumir adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Diretório para a lista nega gerada 'adb_list.overall'."
@@ -550,11 +576,11 @@ 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:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
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."
@@ -584,6 +610,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:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -601,15 +633,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Atraso no gatilho"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registros de Depuração Detalhados"
@@ -621,27 +657,84 @@ msgstr "Aguardando por comando para completar..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Lista Branca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Sim"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-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 "'Jail' Blocklist Creation"
+#~ msgstr "'Enjaule' Criação de Lista Negra"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de Backup"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a "
+#~ "todos os domínios exceto aqueles listados na lista branca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
+#~ "usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
+#~ "backup."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Não atualize as listas de bloqueio automaticamente durante o início, use "
+#~ "o backup das listas como alternativa."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificação por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Quantidade para Notificação por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar cópia de segurança da lista de bloqueio"
+
+#~ 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 ""
+#~ "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)."
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "Redirecione todas as requisições DNS da zona 'LAN' para o servidor local. "
+#~ "Aplica-se aos protocolos UDP e TCP nas portas 53, 853 e 5353."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Enviar notificações por email se ocorrer um erro de processamento ou se a "
+#~ "contagem por domínio for menor que 0."
+
+#~ 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 ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
@@ -658,13 +751,6 @@ msgstr ""
#~ 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 ""
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index a1ac817ba8..1bfc83e6c7 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Создание Черного<br />списка 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -37,15 +33,15 @@ msgstr ""
msgid "Adblock"
msgstr "AdBlock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Состояние Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Дополнительная задержка в секундах до начала работы Adblock."
@@ -58,22 +54,23 @@ msgstr "Дополнительно"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "Папка для бэкапа"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Режим сохранения бекапа"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -83,7 +80,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Источники списков блокировок"
@@ -91,13 +88,7 @@ msgstr "Источники списков блокировок"
msgid "Blocklist not found!"
msgstr "Список блокировок не найден!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-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:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -131,43 +122,49 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Папка DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Описание"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"Не обновлять списки блокировок автоматически во время запуска, вместо этого "
-"использовать резервные копии списков блокировок."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -180,14 +177,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Утилита для скачивания"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "Утилита для скачивания (с библиотекой SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Редактировать Черный список"
@@ -200,31 +221,15 @@ msgstr "Редактировать config файл"
msgid "Edit Whitelist"
msgstr "Редактировать Белый список"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email уведомления"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Кол-во email уведомлений"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Включить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Бэкап списка блокировок"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Включено"
@@ -232,7 +237,7 @@ msgstr "Включено"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Дополнительные настройки"
@@ -246,11 +251,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "Очистка DNS-кэша после обработки Adblock-ом."
@@ -262,7 +267,7 @@ msgstr ""
"<br />Для получения дополнительной информации <a href=\"%s\" target=\"_blank"
"\"> смотрите онлайн документацию</a>."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -270,15 +275,19 @@ 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:116
msgid "Force Local DNS"
msgstr "Локальный DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого списка."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -290,7 +299,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Config файл не найден, настройте config файл."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "Последний запуск"
@@ -298,7 +307,7 @@ msgstr "Последний запуск"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -309,7 +318,13 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"Список поддерживаемых и полностью предварительно настроенных утилит для "
@@ -317,7 +332,7 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "Загрузка"
@@ -325,11 +340,15 @@ msgstr "Загрузка"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Максимальная очередь загрузки"
@@ -338,18 +357,18 @@ msgstr "Максимальная очередь загрузки"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Нет"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Возможные варианты детальной настройки, если значения по умолчанию не "
"подходят для вас."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "Всего доменов"
@@ -372,11 +391,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Редактируйте данный файл только в терминале."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -388,26 +407,30 @@ msgstr "Запрос"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails 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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -415,49 +438,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Возобновить"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "Информация о состоянии"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Запрос SSL"
@@ -467,25 +496,29 @@ msgstr "Запрос SSL"
msgid "Save"
msgstr "Сохранить"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -494,33 +527,33 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Триггер запуска"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "Приостановить"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Приостановить / Возобновить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Папка для созданного списка блокировки 'adb_list.overall'."
@@ -536,11 +569,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -570,6 +603,12 @@ msgstr ""
"Данное поле позволяет запросить домены для конкретных списков, например для "
"Белого списка."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -587,15 +626,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Задержка запуска"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Подробный журнал отладки"
@@ -607,27 +650,55 @@ msgstr "Ожидание завершения выполнения команд
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Файл Белого списка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Да"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"например, чтобы получать email уведомления при каждом обновлении Adblock-а "
-"установите значение 150000."
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Создание Черного<br />списка 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Режим сохранения бекапа"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Создание сжатых резервных копий списков блокировок, они будут "
+#~ "использоваться в случае ошибок загрузки или при запуске в ручном режиме."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Не обновлять списки блокировок автоматически во время запуска, вместо "
+#~ "этого использовать резервные копии списков блокировок."
+
+#~ msgid "Email Notification"
+#~ msgstr "Email уведомления"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Кол-во email уведомлений"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Бэкап списка блокировок"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "например, чтобы получать email уведомления при каждом обновлении Adblock-"
+#~ "а установите значение 150000."
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 31ce45ba11..61dcbbdc18 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -1,11 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -21,15 +17,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Status för Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,22 +38,23 @@ msgstr "Avancerat"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Källor för blockeringslistor"
@@ -75,13 +72,7 @@ msgstr "Källor för blockeringslistor"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-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:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -115,41 +106,49 @@ msgstr ""
msgid "Count"
msgstr "Räkna"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS-mapp"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Beskrivning"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
-"säkerhetskopierade blockeringslistor istället."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -162,14 +161,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "Nerladdningsprogram (SSL-bibliotek)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Redigera svartlista"
@@ -182,31 +205,15 @@ msgstr "Redigerar konfigurationen"
msgid "Edit Whitelist"
msgstr "Redigera vitlista"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Aktivera adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Aktivera säkerhetskopiering av blockeringslistan"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Aktiverad"
@@ -214,7 +221,7 @@ msgstr "Aktiverad"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Extra alternativ"
@@ -228,11 +235,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -242,21 +249,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
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:116
msgid "Force Local DNS"
msgstr "Tvinga lokal DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -269,7 +280,7 @@ msgid "Input file not found, please check your configuration."
msgstr ""
"Inmatningsfilen kunde inte hittas, var vänlig kontrollera din konfiguration."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "Kördes senast"
@@ -277,7 +288,7 @@ msgstr "Kördes senast"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -288,13 +299,19 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "Laddar"
@@ -302,11 +319,15 @@ msgstr "Laddar"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -315,16 +336,16 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Nej"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr ""
@@ -345,11 +366,11 @@ 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:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -361,26 +382,30 @@ msgstr "Fråga"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails 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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -388,49 +413,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "Återuppta"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "Information om körtid"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL-rek."
@@ -440,25 +471,29 @@ msgstr "SSL-rek."
msgid "Save"
msgstr "Spara"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -467,33 +502,33 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Uppstartslösare"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "Stäng av"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "Upphäv / Återuppta adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -507,11 +542,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -539,6 +574,12 @@ msgid ""
"for whitelisting."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -554,15 +595,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr ""
@@ -574,25 +619,29 @@ msgstr "Väntar på att kommandot ska slutföras..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Ja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
+#~ "säkerhetskopierade blockeringslistor istället."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Aktivera säkerhetskopiering av blockeringslistan"
#~ msgid "View Logfile"
#~ msgstr "Visa loggfil"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index f6ef168214..2081d738df 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -1,11 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -21,15 +17,15 @@ msgstr ""
msgid "Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,22 +38,23 @@ msgstr ""
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr ""
@@ -75,13 +72,7 @@ msgstr ""
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-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:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -110,38 +101,48 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
@@ -155,51 +156,59 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
-msgid "Edit Blacklist"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
-msgid "Edit Configuration"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
-msgid "Edit Whitelist"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
-msgid "Enable Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+msgid "Edit Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
+msgid "Edit Configuration"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
+msgid "Edit Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
+msgid "Enable Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr ""
@@ -207,7 +216,7 @@ msgstr ""
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr ""
@@ -221,11 +230,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -235,21 +244,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
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:116
msgid "Force Local DNS"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -261,7 +274,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr ""
@@ -269,7 +282,7 @@ msgstr ""
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -280,13 +293,19 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr ""
@@ -294,11 +313,15 @@ msgstr ""
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -307,16 +330,16 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr ""
@@ -337,11 +360,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -353,26 +376,30 @@ msgstr ""
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails 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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -380,49 +407,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr ""
@@ -432,25 +465,29 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -459,33 +496,33 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -499,11 +536,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -529,6 +566,12 @@ msgid ""
"for whitelisting."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -544,15 +587,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr ""
@@ -564,22 +611,16 @@ msgstr ""
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"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:245
msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 9d189215e3..1585e86302 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”拦截列表创建"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -37,15 +33,15 @@ msgstr "动作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Adblock 状态"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "触发 Adblock 开始处理前的额外延迟(秒)。"
@@ -58,22 +54,23 @@ msgstr "高级"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "存档类别"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "备份目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "备份模式"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "黑名单"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已拦截的 DNS 请求"
@@ -83,7 +80,7 @@ msgstr "已拦截的 DNS 请求"
msgid "Blocked Domain"
msgstr "已拦截的域名"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "拦截列表来源"
@@ -91,15 +88,7 @@ msgstr "拦截列表来源"
msgid "Blocklist not found!"
msgstr "拦截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"构建一个额外的“Jail”列表(/tmp/adb_list.jail),除白名单文件中列出的域名外,"
-"阻止访问其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,49 @@ msgstr "Adblock 配置工具,通过 DNS 来拦截广告和阻止域名。"
msgid "Count"
msgstr "计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS 目录"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr "DNS 查询报告"
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份。"
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +174,38 @@ msgstr "域名"
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "下载工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "下载实用程序(SSL 库)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "编辑黑名单"
@@ -195,31 +218,15 @@ msgstr "编辑设置"
msgid "Edit Whitelist"
msgstr "编辑白名单"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒计数"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "启用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "启用 Blocklist 备份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "启用 DNS 查询报告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "已启用"
@@ -227,7 +234,7 @@ msgstr "已启用"
msgid "End Date"
msgstr "结束日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "额外选项"
@@ -241,11 +248,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程启动后清空 DNS 缓存。"
@@ -255,21 +262,25 @@ msgid ""
"documentation</a>"
msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
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:116
msgid "Force Local DNS"
msgstr "强制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "白名单文件的全路径。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -281,7 +292,7 @@ msgstr "通过 tcpdump 收集 dns 有关的网络流量,以按需提供 DNS
msgid "Input file not found, please check your configuration."
msgstr "输入文件未找到,请检查您的配置。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "最后运行"
@@ -289,7 +300,7 @@ msgstr "最后运行"
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查询"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -300,13 +311,19 @@ 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:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "加载中"
@@ -314,11 +331,15 @@ msgstr "加载中"
msgid "Logfile"
msgstr "日志文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低优先级服务"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "最大下载队列"
@@ -327,16 +348,16 @@ msgstr "最大下载队列"
msgid "Name / IP-Address"
msgstr "名称 / IP 地址"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在默认设置并不适合您时的额外选项。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "域名总览"
@@ -359,11 +380,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "请在终端会话中直接编辑此文件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr "请注意:这需要手动安装和设置“msmtp”软件包。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr "请注意:这需要手动安装和设置“tcpdump-mini”软件包。"
@@ -375,30 +396,30 @@ msgstr "查询"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"将所有 DNS 查询从“lan”区域重定向到本地解析器,适用于端口53、853和5353上的 "
-"udp 和 tcp 协议。"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr "刷新"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr "刷新拦截列表源"
@@ -406,49 +427,55 @@ msgstr "刷新拦截列表源"
msgid "Refresh Report"
msgstr "刷新报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr "报告区块计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr "报告区块大小"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "报告目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr "报告接口"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 将使用的报告区块计数(默认为“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr "tcpdump 将使用的报告区块大小(MB)(默认为“1”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "恢复"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "运行信息"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 要求"
@@ -458,25 +485,29 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。"
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr "设置 nice 级别为“低优先级”,adblock 后台进程将从系统中获取更少的资源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "处理下载队列的大小及并行处理列表(默认为“8”)。"
+"parallel (default '4')."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -485,34 +516,33 @@ msgstr ""
msgid "Start Date"
msgstr "开始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "启动触发器"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "暂停"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "暂停/恢复 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"dns 相关报告文件的目标目录。请优先使用非易失性磁盘,例如:一个外置 U 盘。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成拦截列表“adb_list.overall”的目标目录。"
@@ -526,11 +556,11 @@ 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:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手动停止/重启服务才能生效。"
@@ -556,6 +586,12 @@ msgid ""
"for whitelisting."
msgstr "此表单允许您查询某些域的活动块列表,例如用于列出白名单。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -571,15 +607,19 @@ msgstr "要覆盖默认路径,请使用下面额外部分中的“DNS 目录
msgid "Top 10 Reporting"
msgstr "前十报告"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查询总数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "触发延迟"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "详细的调试记录"
@@ -591,25 +631,99 @@ msgstr "正在等待命令完成…"
msgid "Whitelist"
msgstr "白名单"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "白名单文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性拦截列表,例如访客 wifi 或家长模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”拦截列表创建"
+
+#~ msgid "Backup Mode"
+#~ msgstr "备份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "构建一个额外的“Jail”列表(/tmp/adb_list.jail),除白名单文件中列出的域名"
+#~ "外,阻止访问其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒计数"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "启用 Blocklist 备份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "启用 DNS 查询报告"
+
+#~ 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 ""
+#~ "如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电"
+#~ "子邮件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "将所有 DNS 查询从“lan”区域重定向到本地解析器,适用于端口53、853和5353上的 "
+#~ "udp 和 tcp 协议。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "处理下载队列的大小及并行处理列表(默认为“8”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相关报告文件的目标目录。请优先使用非易失性磁盘,例如:一个外置 U 盘。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性拦截列表,例如访客 wifi 或家长模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index ddcb76a1ea..9e52ab5135 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”攔截列表建立"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
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!"
@@ -37,15 +33,15 @@ msgstr "動作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
msgid "Adblock Status"
msgstr "Adblock 狀態"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
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:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "觸發 Adblock 開始處理前的額外延遲(秒)。"
@@ -58,22 +54,23 @@ msgstr "高階"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "存檔類別"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "Backup Directory"
msgstr "備份目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "備份模式"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "黑名單"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已攔截的 DNS 請求"
@@ -83,7 +80,7 @@ msgstr "已攔截的 DNS 請求"
msgid "Blocked Domain"
msgstr "已攔截的域名"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "攔截列表來源"
@@ -91,15 +88,7 @@ msgstr "攔截列表來源"
msgid "Blocklist not found!"
msgstr "攔截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"構建一個額外的“Jail”列表(/tmp/adb_list.jail),除白名單檔案中列出的域名外,"
-"阻止訪問其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,49 @@ msgstr "Adblock 配置工具,通過 DNS 來攔截廣告和阻止域名。"
msgid "Count"
msgstr "計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-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:24
-#: 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/view/adblock/runtime.htm:163
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS 目錄"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
msgid "DNS Query Report"
msgstr "DNS 查詢報告"
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Variant, DNS File Reset"
+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:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份。"
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +174,38 @@ msgstr "域名"
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "下載工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Download Utility (SSL Library)"
msgstr "下載實用程式(SSL 庫)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "編輯黑名單"
@@ -195,31 +218,15 @@ msgstr "編輯設定"
msgid "Edit Whitelist"
msgstr "編輯白名單"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒計數"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "啟用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "啟用 Blocklist 備份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "啟用 DNS 查詢報告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "已啟用"
@@ -227,7 +234,7 @@ msgstr "已啟用"
msgid "End Date"
msgstr "結束日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "額外選項"
@@ -241,11 +248,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "Flush DNS Cache"
msgstr "清空 DNS 快取"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 程序啟動後清空 DNS 快取。"
@@ -255,21 +262,25 @@ msgid ""
"documentation</a>"
msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
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:116
msgid "Force Local DNS"
msgstr "強制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "白名單檔案的全路徑。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -281,7 +292,7 @@ msgstr "通過 tcpdump 收集 dns 有關的網路流量,以按需提供 DNS
msgid "Input file not found, please check your configuration."
msgstr "輸入檔案未找到,請檢查您的配置。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Last Run"
msgstr "最後執行"
@@ -289,7 +300,7 @@ msgstr "最後執行"
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查詢"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -300,13 +311,19 @@ 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:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
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:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:92
msgid "Loading"
msgstr "載入中"
@@ -314,11 +331,15 @@ msgstr "載入中"
msgid "Logfile"
msgstr "日誌檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低優先順序服務"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "最大下載佇列"
@@ -327,16 +348,16 @@ msgstr "最大下載佇列"
msgid "Name / IP-Address"
msgstr "名稱 / IP 地址"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在預設設定並不適合您時的額外選項。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Overall Domains"
msgstr "域名總覽"
@@ -359,11 +380,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "請在終端會話中直接編輯此檔案。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr "請注意:這需要手動安裝和設定“msmtp”軟體包。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr "請注意:這需要手動安裝和設定“tcpdump-mini”軟體包。"
@@ -375,30 +396,30 @@ msgstr "查詢"
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:244
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
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:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"將所有 DNS 查詢從“lan”區域重定向到本地解析器,適用於埠53、853和5353上的 udp "
-"和 tcp 協議。"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:105
msgid "Refresh"
msgstr "重新整理"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
msgid "Refresh Blocklist Sources"
msgstr "重新整理攔截列表源"
@@ -406,49 +427,55 @@ msgstr "重新整理攔截列表源"
msgid "Refresh Report"
msgstr "重新整理報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
msgid "Report Chunk Count"
msgstr "報告區塊計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
msgid "Report Chunk Size"
msgstr "報告區塊大小"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "報告目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
msgid "Report Interface"
msgstr "報告介面"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 將使用的報告區塊計數(預設為“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr "tcpdump 將使用的報告區塊大小(MB)(預設為“1”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
msgstr "恢復"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
msgid "Runtime Information"
msgstr "執行資訊"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 要求"
@@ -458,26 +485,30 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "儲存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果發生錯誤或域計數 &le; 0,傳送通知電子郵件。"
+"Send notification E-Mails 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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
"設定 nice 級別為“低優先順序”,adblock 後臺程序將從系統中獲取更少的資源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "處理下載佇列的大小及並行處理列表(預設為“8”)。"
+"parallel (default '4')."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -486,34 +517,33 @@ msgstr ""
msgid "Start Date"
msgstr "開始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "啟動觸發器"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
msgid "Suspend"
msgstr "暫停"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
msgid "Suspend / Resume Adblock"
msgstr "暫停/恢復 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟,例如:一個外接 U 盤。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成攔截列表“adb_list.overall”的目標目錄。"
@@ -527,11 +557,11 @@ 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:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:216
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:223
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手動停止/重啟服務才能生效。"
@@ -557,6 +587,12 @@ msgid ""
"for whitelisting."
msgstr "此表單允許您查詢某些域的活動塊列表,例如用於列出白名單。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -572,15 +608,19 @@ msgstr "要覆蓋預設路徑,請使用下面額外部分中的“DNS 目錄
msgid "Top 10 Reporting"
msgstr "前十報告"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查詢總數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "觸發延遲"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "詳細的除錯記錄"
@@ -592,25 +632,99 @@ msgstr "正在等待指令完成…"
msgid "Whitelist"
msgstr "白名單"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "白名單檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性攔截列表,例如訪客 wifi 或家長模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”攔截列表建立"
+
+#~ msgid "Backup Mode"
+#~ msgstr "備份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "構建一個額外的“Jail”列表(/tmp/adb_list.jail),除白名單檔案中列出的域名"
+#~ "外,阻止訪問其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模式啟動期間使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒計數"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "啟用 Blocklist 備份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "啟用 DNS 查詢報告"
+
+#~ 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 ""
+#~ "如果總數小於或等於給定限制(預設為 0),請提高最小電子郵件通知數,以獲取電"
+#~ "子郵件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "將所有 DNS 查詢從“lan”區域重定向到本地解析器,適用於埠53、853和5353上的 "
+#~ "udp 和 tcp 協議。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果發生錯誤或域計數 &le; 0,傳送通知電子郵件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "處理下載佇列的大小及並行處理列表(預設為“8”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟,例如:一個外接 U 盤。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性攔截列表,例如訪客 wifi 或家長模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "