summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua79
-rw-r--r--applications/luci-app-adblock/po/es/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po119
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot113
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po113
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po113
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po2
-rw-r--r--applications/luci-app-travelmate/po/es/travelmate.po52
-rw-r--r--applications/luci-app-travelmate/po/ja/travelmate.po60
-rw-r--r--applications/luci-app-travelmate/po/pt-br/travelmate.po52
-rw-r--r--applications/luci-app-travelmate/po/ru/travelmate.po52
-rw-r--r--applications/luci-app-travelmate/po/templates/travelmate.pot52
-rw-r--r--applications/luci-app-travelmate/po/zh-cn/travelmate.po52
-rw-r--r--applications/luci-app-travelmate/po/zh-tw/travelmate.po52
-rw-r--r--applications/luci-app-vpnbypass/Makefile6
-rw-r--r--applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua9
-rw-r--r--applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua47
21 files changed, 962 insertions, 576 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 0c55ca7632..d6c5ac54c0 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -183,12 +183,29 @@ e23 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"),
e23.datatype = "range(1,60)"
e23.optional = true
-e24 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
- translate("Flush DNS Cache after adblock processing."))
+e24 = e:option(Value, "adb_maxtld", translate("TLD Compression Threshold"),
+ translate("Disable the toplevel domain compression, if the number of blocked domains is greater than this threshold."))
+e24.datatype = "min(0)"
+e24.default = 100000
e24.optional = true
-e24.default = nil
-e25 = e:option(ListValue, "adb_repiface", translate("Report Interface"),
+e25 = e:option(Value, "adb_portlist", translate("Local FW/DNS Ports"),
+ translate("Space separated list of firewall ports which should be redirected locally."))
+e25.default = "53 853 5353"
+e25.optional = true
+
+e26 = e:option(Flag, "adb_dnsinotify", translate("DNS Inotify"),
+ translate("Disable adblock triggered restarts and the 'DNS File Reset' for dns backends with autoload features."))
+e26.default = nil
+e26.enabled = "true"
+e26.optional = true
+
+e27 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
+ translate("Flush DNS Cache after adblock processing."))
+e27.default = nil
+e27.optional = true
+
+e28 = e:option(ListValue, "adb_repiface", translate("Report Interface"),
translate("Reporting interface used by tcpdump, set to 'any' for multiple interfaces (default 'br-lan'). ")
..translate("This change requires a manual service stop/re-start to take effect."))
if dump then
@@ -197,54 +214,54 @@ if dump then
if v.interface ~= "loopback" then
local device = v.device
if device then
- e25:value(device)
+ e28:value(device)
end
end
end
end
-e25:value("any")
-e25.optional = true
+e28:value("any")
+e28.optional = true
-e26 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"),
+e29 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"),
translate("Space separated list of reporting port(s) used by tcpdump (default: '53'). ")
..translate("This change requires a manual service stop/re-start to take effect."))
-e26.default = 53
-e26.optional = true
+e29.default = 53
+e29.optional = true
-e27 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"),
+e30 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"),
translate("Report chunk count used by tcpdump (default '5'). ")
..translate("This change requires a manual service stop/re-start to take effect."))
-e27.datatype = "range(1,10)"
-e27.default = 5
-e27.optional = true
+e30.datatype = "range(1,10)"
+e30.default = 5
+e30.optional = true
-e28 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"),
+e31 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"),
translate("Report chunk size used by tcpdump in MB (default '1'). ")
..translate("This change requires a manual service stop/re-start to take effect."))
-e28.datatype = "range(1,10)"
-e28.default = 1
-e28.optional = true
+e31.datatype = "range(1,10)"
+e31.default = 1
+e31.optional = true
-e29 = e:option(Value, "adb_msender", translate("E-Mail Sender Address"),
+e32 = e:option(Value, "adb_msender", translate("E-Mail Sender Address"),
translate("Sender address for adblock notification E-Mails."))
-e29.default = "no-reply@adblock"
-e29.optional = true
+e32.default = "no-reply@adblock"
+e32.optional = true
-e30 = e:option(Value, "adb_mtopic", translate("E-Mail Topic"),
+e33 = e:option(Value, "adb_mtopic", translate("E-Mail Topic"),
translate("Topic for adblock notification E-Mails."))
-e30.default = "adblock notification"
-e30.optional = true
+e33.default = "adblock notification"
+e33.optional = true
-e31 = e:option(Value, "adb_mprofile", translate("E-Mail Profile"),
+e34 = e:option(Value, "adb_mprofile", translate("E-Mail Profile"),
translate("Mail profile used in 'msmtp' for adblock notification E-Mails."))
-e31.default = "adb_notify"
-e31.optional = true
+e34.default = "adb_notify"
+e34.optional = true
-e32 = e:option(Value, "adb_mcnt", translate("E-Mail Notification Count"),
+e35 = e:option(Value, "adb_mcnt", translate("E-Mail Notification Count"),
translate("Raise the minimum notification count, to get E-Mails if the overall count is less or equal to the given limit (default 0), ")
.. translate("e.g. to receive an E-Mail notification with every adblock run set this value to 200000."))
-e32.default = 0
-e32.datatype = "min(0)"
-e32.optional = true
+e35.default = 0
+e35.datatype = "min(0)"
+e35.optional = true
return m
diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index d7164c7213..c7c1e47bd3 100644
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -30,11 +30,11 @@ msgstr "Acción"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Estado de Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versión de Adblock"
@@ -58,7 +58,7 @@ msgid "Archive Categories"
msgstr "Categorías de archivo"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Directorio de respaldo"
@@ -125,7 +125,7 @@ msgstr "Contar"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS Backend (Directorio DNS)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -141,12 +141,16 @@ msgstr "Directorio DNS"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -159,6 +163,18 @@ msgstr "Fecha"
msgid "Description"
msgstr "Descripción"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -180,7 +196,7 @@ msgstr "Dominio/Cliente/Fecha/Hora"
msgid "Download Utility"
msgstr "Utilidad de descarga"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Utilidad de descarga (Biblioteca SSL)"
@@ -188,11 +204,11 @@ msgstr "Utilidad de descarga (Biblioteca SSL)"
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -200,11 +216,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -254,11 +270,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:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Vaciar caché de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Vaciar el caché de DNS después del procesamiento de adblock."
@@ -304,7 +320,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:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Último inicio"
@@ -340,10 +356,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Cargando"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr "Archivo de registro"
@@ -352,7 +372,7 @@ msgstr "Archivo de registro"
msgid "Low Priority Service"
msgstr "Servicio con prioridad baja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -376,7 +396,7 @@ 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:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Dominios generales"
@@ -420,7 +440,7 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Dominios de consulta"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -436,14 +456,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr "Refrescar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "Actualizar las fuentes de la lista de bloqueo"
@@ -451,11 +471,11 @@ 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:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "Informe de recuento de fragmentos"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "Tamaño del fragmento de informe"
@@ -463,26 +483,26 @@ msgstr "Tamaño del fragmento de informe"
msgid "Report Directory"
msgstr "Directorio de informes"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "Interfaz de informe"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr "Informe escuchar puerto(s)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
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:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
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:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -496,11 +516,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Reanudar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Información en tiempo de ejecución"
@@ -520,7 +540,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -538,7 +558,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -553,16 +578,20 @@ msgstr "Fecha de inicio"
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "Suspender"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Reanudar Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -594,10 +623,10 @@ msgstr ""
"La salida de syslog, prefiltrada solo para mensajes relacionados con adblock."
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
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 "
@@ -656,7 +685,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "Top 10 de informes"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -688,7 +717,7 @@ msgstr "Archivo de lista blanca"
msgid "Yes"
msgstr "Si"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index dcb742f5d2..f9c2676382 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -27,11 +27,11 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Status Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versione Adblock"
@@ -53,7 +53,7 @@ msgid "Archive Categories"
msgstr ""
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Directory del Backup"
@@ -119,7 +119,7 @@ msgstr ""
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -135,12 +135,16 @@ msgstr "Directory DNS"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -153,6 +157,18 @@ msgstr ""
msgid "Description"
msgstr "Descrizione"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -174,7 +190,7 @@ msgstr ""
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr ""
@@ -182,11 +198,11 @@ msgstr ""
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -194,11 +210,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -245,11 +261,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -289,7 +305,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:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Ultimo Avvio"
@@ -320,10 +336,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Caricando"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr ""
@@ -332,7 +352,7 @@ msgstr ""
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -356,7 +376,7 @@ msgstr ""
"Opzioni per ulteriori modifiche in caso che quelle di default non ti sono "
"adatte."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -396,7 +416,7 @@ msgstr "Interrogazione"
msgid "Query domains"
msgstr "Interrogazione domini"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -412,14 +432,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -427,11 +447,11 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
@@ -439,23 +459,23 @@ msgstr ""
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -467,11 +487,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Riprendi"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Informazione di Runtime"
@@ -491,7 +511,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -507,7 +527,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -520,16 +545,20 @@ msgstr ""
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "Sospendi"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Sospendi / Riprendi Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -557,10 +586,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -613,7 +642,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -645,7 +674,7 @@ msgstr ""
msgid "Yes"
msgstr "Sì"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 08eaa98e80..dd8c8af143 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -29,11 +29,11 @@ msgstr "アクション"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock ステータス"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock バージョン"
@@ -55,7 +55,7 @@ msgid "Archive Categories"
msgstr "アーカイブ カテゴリ"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "バックアップ先 ディレクトリ"
@@ -122,7 +122,7 @@ msgstr "カウント"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS バックエンド(DNS ディレクトリ)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr "DNS バックエンド, DNS ディレクトリ"
@@ -138,12 +138,16 @@ msgstr "DNS ディレクトリ"
msgid "DNS File Reset"
msgstr "DNS ファイル リセット"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr "DNS Inotify"
+
#: 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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr "DNS 種別, DNS ファイル リセット"
@@ -156,6 +160,22 @@ msgstr "日付"
msgid "Description"
msgstr "説明"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+"自動読み込み機能を持つ DNS バックエンドのため、adblockが引き起こす再起動と "
+"'DNS ファイル リセット' を無効にします。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+"ブロックされたドメイン数がこの閾値を超える場合、トップレベル ドメインの圧縮を"
+"無効にします。"
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -178,7 +198,7 @@ msgstr "ドメイン / クライアント / 日付 / 時刻"
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
@@ -186,11 +206,11 @@ msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
msgid "E-Mail Notification"
msgstr "Eメール通知"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr "Eメール通知カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr "Eメール プロファイル"
@@ -198,11 +218,11 @@ msgstr "Eメール プロファイル"
msgid "E-Mail Receiver Address"
msgstr "Eメール受信アドレス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr "Eメール送信アドレス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr "Eメール題名"
@@ -251,11 +271,11 @@ msgstr ""
"DNS クエリの結果セットを、指定したドメインやクライアント、日時によってフィル"
"タします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "DNS キャッシュのクリア"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
@@ -301,7 +321,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "入力ファイルが見つかりません。設定を確認してください。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最終実行"
@@ -338,10 +358,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "読込中"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr "ローカル FW/DNS ポート"
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr "ログファイル"
@@ -350,7 +374,7 @@ msgstr "ログファイル"
msgid "Low Priority Service"
msgstr "低優先度サービス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
"adblock 通知メールのために 'msmtp' で使用される、メール プロファイルです。"
@@ -373,7 +397,7 @@ msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "全体のドメイン"
@@ -416,7 +440,7 @@ msgstr "検索"
msgid "Query domains"
msgstr "ドメインの検索"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -436,14 +460,14 @@ 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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr "リフレッシュ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "ブロックリスト提供元のリフレッシュ"
@@ -451,11 +475,11 @@ msgstr "ブロックリスト提供元のリフレッシュ"
msgid "Refresh Report"
msgstr "レポートをリフレッシュ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "レポート チャンクカウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "レポート チャンクサイズ"
@@ -463,23 +487,23 @@ msgstr "レポート チャンクサイズ"
msgid "Report Directory"
msgstr "レポート ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "レポート インターフェース"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr "レポート待ち受けポート"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump により使用される、レポートチャンク数です。(規定値: '5')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
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:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -495,11 +519,11 @@ msgstr ""
"最終的な DNS ブロックファイル 'adb_list.overall' を、DNS バックエンドを通して"
"読み込み後にリセットします。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "再開"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "ランタイム情報"
@@ -520,7 +544,7 @@ msgid ""
msgstr ""
"処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr "adblock 通知メールの送信アドレスです。"
@@ -540,7 +564,14 @@ msgstr ""
"ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ"
"ズです。(規定値: '4')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+"スペースで区切られた、ローカルにリダイレクトされるファイアウォール ポートのリ"
+"ストです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -555,16 +586,20 @@ msgstr "開始日"
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "一時停止"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Adblock の一時停止 / 再開"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr "TLD 圧縮閾値"
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -598,10 +633,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。"
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。"
@@ -660,7 +695,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "上位 10 レポート"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr "adblock 通知メールの題名です。"
@@ -692,7 +727,7 @@ msgstr "ホワイトリスト ファイル"
msgid "Yes"
msgstr "はい"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 539d32a773..e524951c1f 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -30,11 +30,11 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Estado do Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versão do Adblock"
@@ -58,7 +58,7 @@ msgid "Archive Categories"
msgstr "Categorias Arquivadas"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
@@ -125,7 +125,7 @@ msgstr ""
msgid "DNS Backend (DNS Directory)"
msgstr "Serviço DNS (Diretório DNS)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -141,12 +141,16 @@ msgstr "Diretório DNS"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -159,6 +163,18 @@ msgstr ""
msgid "Description"
msgstr "Descrição"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -180,7 +196,7 @@ msgstr ""
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Utilitário de Download (Biblioteca SSL)"
@@ -188,11 +204,11 @@ msgstr "Utilitário de Download (Biblioteca SSL)"
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -200,11 +216,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -252,11 +268,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Limpar cache DNS depois do processamento do adblock."
@@ -300,7 +316,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:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Última Execução"
@@ -335,10 +351,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Carregando"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr ""
@@ -347,7 +367,7 @@ msgstr ""
msgid "Low Priority Service"
msgstr "Serviço de Baixa Prioridade"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -371,7 +391,7 @@ 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:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Domínios Globais"
@@ -411,7 +431,7 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Consulta de domínios"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -427,14 +447,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr "Atualizar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "Atualizar as Fontes de Lista Negra"
@@ -442,11 +462,11 @@ msgstr "Atualizar as Fontes de Lista Negra"
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
@@ -454,23 +474,23 @@ msgstr ""
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -482,11 +502,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Continuar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Informação de execução"
@@ -506,7 +526,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -526,7 +546,12 @@ 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:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -539,16 +564,20 @@ msgstr ""
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "Suspender"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Resumir adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -577,10 +606,10 @@ 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: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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
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."
@@ -633,7 +662,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -665,7 +694,7 @@ msgstr "Lista Branca"
msgid "Yes"
msgstr "Sim"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index 1bfc83e6c7..4218abc691 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -33,11 +33,11 @@ msgstr ""
msgid "Adblock"
msgstr "AdBlock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Состояние Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Версия Adblock"
@@ -59,7 +59,7 @@ msgid "Archive Categories"
msgstr ""
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Папка для бэкапа"
@@ -126,7 +126,7 @@ msgstr ""
msgid "DNS Backend (DNS Directory)"
msgstr "DNS бэкенд (папка DNS)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -142,12 +142,16 @@ msgstr "Папка DNS"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -160,6 +164,18 @@ msgstr ""
msgid "Description"
msgstr "Описание"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -181,7 +197,7 @@ msgstr ""
msgid "Download Utility"
msgstr "Утилита для скачивания"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Утилита для скачивания (с библиотекой SSL)"
@@ -189,11 +205,11 @@ msgstr "Утилита для скачивания (с библиотекой SS
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -201,11 +217,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -251,11 +267,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Очистка DNS-кэша после обработки Adblock-ом."
@@ -299,7 +315,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Config файл не найден, настройте config файл."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Последний запуск"
@@ -332,10 +348,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Загрузка"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr ""
@@ -344,7 +364,7 @@ msgstr ""
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -368,7 +388,7 @@ msgstr ""
"Возможные варианты детальной настройки, если значения по умолчанию не "
"подходят для вас."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Всего доменов"
@@ -407,7 +427,7 @@ msgstr "Запрос"
msgid "Query domains"
msgstr "Запрос доменов"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -423,14 +443,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -438,11 +458,11 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
@@ -450,23 +470,23 @@ msgstr ""
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -478,11 +498,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Возобновить"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Информация о состоянии"
@@ -502,7 +522,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -518,7 +538,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -531,16 +556,20 @@ msgstr ""
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "Приостановить"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Приостановить / Возобновить Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -570,10 +599,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -626,7 +655,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -658,7 +687,7 @@ msgstr "Файл Белого списка"
msgid "Yes"
msgstr "Да"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 61dcbbdc18..5d6ea65778 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -17,11 +17,11 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Status för Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Version av Adblock"
@@ -43,7 +43,7 @@ msgid "Archive Categories"
msgstr ""
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
@@ -110,7 +110,7 @@ msgstr "Räkna"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS-bakände (DNS-mapp)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -126,12 +126,16 @@ msgstr "DNS-mapp"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -144,6 +148,18 @@ msgstr ""
msgid "Description"
msgstr "Beskrivning"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -165,7 +181,7 @@ msgstr ""
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Nerladdningsprogram (SSL-bibliotek)"
@@ -173,11 +189,11 @@ msgstr "Nerladdningsprogram (SSL-bibliotek)"
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -185,11 +201,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -235,11 +251,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -280,7 +296,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:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Kördes senast"
@@ -311,10 +327,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Laddar"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr ""
@@ -323,7 +343,7 @@ msgstr ""
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -345,7 +365,7 @@ msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -382,7 +402,7 @@ msgstr "Fråga"
msgid "Query domains"
msgstr "Fråga efter domäner"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -398,14 +418,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -413,11 +433,11 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
@@ -425,23 +445,23 @@ msgstr ""
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -453,11 +473,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Återuppta"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Information om körtid"
@@ -477,7 +497,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -493,7 +513,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -506,16 +531,20 @@ msgstr ""
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "Stäng av"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "Upphäv / Återuppta adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -543,10 +572,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -595,7 +624,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -627,7 +656,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 2081d738df..6f8466332c 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -17,11 +17,11 @@ msgstr ""
msgid "Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr ""
@@ -43,7 +43,7 @@ msgid "Archive Categories"
msgstr ""
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr ""
@@ -105,7 +105,7 @@ msgstr ""
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -121,12 +121,16 @@ msgstr ""
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -139,6 +143,18 @@ msgstr ""
msgid "Description"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -160,7 +176,7 @@ msgstr ""
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr ""
@@ -168,11 +184,11 @@ msgstr ""
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -180,11 +196,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -230,11 +246,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -274,7 +290,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr ""
@@ -305,10 +321,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr ""
@@ -317,7 +337,7 @@ msgstr ""
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -339,7 +359,7 @@ msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -376,7 +396,7 @@ msgstr ""
msgid "Query domains"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -392,14 +412,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -407,11 +427,11 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
@@ -419,23 +439,23 @@ msgstr ""
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -447,11 +467,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr ""
@@ -471,7 +491,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -487,7 +507,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -500,16 +525,20 @@ msgstr ""
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -537,10 +566,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -587,7 +616,7 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -619,7 +648,7 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 1585e86302..31b1dba65a 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -33,11 +33,11 @@ msgstr "动作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock 状态"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock 版本"
@@ -59,7 +59,7 @@ msgid "Archive Categories"
msgstr "存档类别"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "备份目录"
@@ -123,7 +123,7 @@ msgstr "计数"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 后端(DNS 目录)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -139,12 +139,16 @@ msgstr "DNS 目录"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -157,6 +161,18 @@ msgstr "日期"
msgid "Description"
msgstr "描述"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -178,7 +194,7 @@ msgstr ""
msgid "Download Utility"
msgstr "下载工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "下载实用程序(SSL 库)"
@@ -186,11 +202,11 @@ msgstr "下载实用程序(SSL 库)"
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -198,11 +214,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -248,11 +264,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程启动后清空 DNS 缓存。"
@@ -292,7 +308,7 @@ msgstr "通过 tcpdump 收集 dns 有关的网络流量,以按需提供 DNS
msgid "Input file not found, please check your configuration."
msgstr "输入文件未找到,请检查您的配置。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最后运行"
@@ -323,10 +339,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "加载中"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr "日志文件"
@@ -335,7 +355,7 @@ msgstr "日志文件"
msgid "Low Priority Service"
msgstr "低优先级服务"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -357,7 +377,7 @@ msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在默认设置并不适合您时的额外选项。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "域名总览"
@@ -396,7 +416,7 @@ msgstr "查询"
msgid "Query domains"
msgstr "查询域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -412,14 +432,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr "刷新"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "刷新拦截列表源"
@@ -427,11 +447,11 @@ msgstr "刷新拦截列表源"
msgid "Refresh Report"
msgstr "刷新报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "报告区块计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "报告区块大小"
@@ -439,23 +459,23 @@ msgstr "报告区块大小"
msgid "Report Directory"
msgstr "报告目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "报告接口"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 将使用的报告区块计数(默认为“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
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:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -467,11 +487,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "恢复"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "运行信息"
@@ -491,7 +511,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -507,7 +527,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -520,16 +545,20 @@ msgstr "开始日期"
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "暂停"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "暂停/恢复 Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -557,10 +586,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系统日志输出,仅针对 adblock 相关的消息进行了预筛选。"
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手动停止/重启服务才能生效。"
@@ -607,7 +636,7 @@ msgstr "要覆盖默认路径,请使用下面额外部分中的“DNS 目录
msgid "Top 10 Reporting"
msgstr "前十报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -639,7 +668,7 @@ msgstr "白名单文件"
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 9e52ab5135..3940343e94 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -33,11 +33,11 @@ msgstr "動作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:145
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock 狀態"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock 版本"
@@ -59,7 +59,7 @@ msgid "Archive Categories"
msgstr "存檔類別"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "備份目錄"
@@ -123,7 +123,7 @@ msgstr "計數"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 後端(DNS 目錄)"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
msgstr ""
@@ -139,12 +139,16 @@ msgstr "DNS 目錄"
msgid "DNS File Reset"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+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
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
msgstr ""
@@ -157,6 +161,18 @@ msgstr "日期"
msgid "Description"
msgstr "描述"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
+msgid ""
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
@@ -178,7 +194,7 @@ msgstr ""
msgid "Download Utility"
msgstr "下載工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "下載實用程式(SSL 庫)"
@@ -186,11 +202,11 @@ msgstr "下載實用程式(SSL 庫)"
msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:243
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
msgstr ""
@@ -198,11 +214,11 @@ msgstr ""
msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:228
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
msgstr ""
@@ -248,11 +264,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "清空 DNS 快取"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 程序啟動後清空 DNS 快取。"
@@ -292,7 +308,7 @@ msgstr "通過 tcpdump 收集 dns 有關的網路流量,以按需提供 DNS
msgid "Input file not found, please check your configuration."
msgstr "輸入檔案未找到,請檢查您的配置。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最後執行"
@@ -323,10 +339,14 @@ 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:92
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "載入中"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr "日誌檔案"
@@ -335,7 +355,7 @@ msgstr "日誌檔案"
msgid "Low Priority Service"
msgstr "低優先順序服務"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
@@ -357,7 +377,7 @@ msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在預設設定並不適合您時的額外選項。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "域名總覽"
@@ -396,7 +416,7 @@ msgstr "查詢"
msgid "Query domains"
msgstr "查詢域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:244
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
@@ -412,14 +432,14 @@ msgid ""
"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:105
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
msgid "Refresh"
msgstr "重新整理"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:202
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "重新整理攔截列表源"
@@ -427,11 +447,11 @@ msgstr "重新整理攔截列表源"
msgid "Refresh Report"
msgstr "重新整理報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:214
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "報告區塊計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:221
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "報告區塊大小"
@@ -439,23 +459,23 @@ msgstr "報告區塊大小"
msgid "Report Directory"
msgstr "報告目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:191
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "報告介面"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:215
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 將使用的報告區塊計數(預設為“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:222
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
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:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
@@ -467,11 +487,11 @@ msgid ""
"DNS backend."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "恢復"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:143
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "執行資訊"
@@ -491,7 +511,7 @@ msgid ""
"is ≤ 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:229
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
msgstr ""
@@ -508,7 +528,12 @@ msgid ""
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
@@ -521,16 +546,20 @@ msgstr "開始日期"
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:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
msgid "Suspend"
msgstr "暫停"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:194
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
msgid "Suspend / Resume Adblock"
msgstr "暫停/恢復 Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
@@ -558,10 +587,10 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系統日誌輸出,僅針對 adblock 相關的訊息進行了預篩選。"
#: 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
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需要手動停止/重啟服務才能生效。"
@@ -608,7 +637,7 @@ msgstr "要覆蓋預設路徑,請使用下面額外部分中的“DNS 目錄
msgid "Top 10 Reporting"
msgstr "前十報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:234
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
msgstr ""
@@ -640,7 +669,7 @@ msgstr "白名單檔案"
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 17810618ed..f1a9a084b7 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -129,7 +129,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
msgid "Conntrack Settings"
msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">""
+"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">"
"Conntrack</abbr>)"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
diff --git a/applications/luci-app-travelmate/po/es/travelmate.po b/applications/luci-app-travelmate/po/es/travelmate.po
index 7c39530d2c..cbb83d9b9f 100644
--- a/applications/luci-app-travelmate/po/es/travelmate.po
+++ b/applications/luci-app-travelmate/po/es/travelmate.po
@@ -21,6 +21,10 @@ msgstr "AP en"
msgid "Action"
msgstr "Acción"
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "Añadir enlace"
@@ -29,7 +33,7 @@ msgstr "Añadir enlace"
msgid "Add Wireless Uplink Configuration"
msgstr "Añadir configuración de enlace inalámbrico"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr ""
@@ -57,7 +61,13 @@ msgstr ""
msgid "Automatic"
msgstr "Automático"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -77,7 +87,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "Volver a la visión general"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
"Tamaño del búfer en bytes para preparar resultados de escaneo cercanos."
@@ -109,7 +119,7 @@ msgstr ""
"Configuración del paquete travelmate para habilitar la funcionalidad de "
"enrutador de viaje."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "Límite de conexión"
@@ -176,7 +186,7 @@ msgstr "Editar este enlace"
msgid "Enable Travelmate"
msgstr "Habilitar Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "Habilitar registro de depuración detallado"
@@ -198,7 +208,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "Opciones extra"
@@ -243,7 +253,7 @@ msgstr "Forzar TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "Forzar TKIP and CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr ""
@@ -266,7 +276,7 @@ msgstr "Ignorar BSSID"
msgid "Input file not found, please check your configuration."
msgstr "Archivo de entrada no encontrado, por favor revise su configuración."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "Tiempo de espera de la interfaz"
@@ -278,7 +288,7 @@ msgstr "Asistente de interfaz"
msgid "Last Run"
msgstr "Último inicio"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr "Lista de caducidad automática"
@@ -286,7 +296,7 @@ msgstr "Lista de caducidad automática"
msgid "Loading"
msgstr "Cargando"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -302,7 +312,7 @@ msgstr "Mover abajo"
msgid "Move up"
msgstr "Mover arriba"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "Nombre de la interfaz de enlace utilizada."
@@ -314,18 +324,18 @@ msgstr "Comprobación de error neto"
msgid "Open"
msgstr "Abrir"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
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-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "Tiempo de espera total"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr "Tiempo de espera de reintento global en segundos."
@@ -386,7 +396,7 @@ msgstr ""
"enlaces existentes o escanear uno nuevo. El enlace utilizado actualmente se "
"enfatiza en azul, las estaciones defectuosas en rojo."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr "Selección de Radio / Orden"
@@ -403,7 +413,7 @@ msgstr "Reiniciar"
msgid "Restart Travelmate"
msgstr "Reiniciar Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
@@ -411,7 +421,7 @@ msgstr ""
"Restringir Travelmate a una sola radio (por ejemplo, 'radio1') o cambie el "
"orden de exploración general (por ejemplo, 'radio1 radio2 radio0')."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr "Vuelva a intentar el límite para conectarse a un enlace ."
@@ -442,7 +452,7 @@ msgstr "Guardar"
msgid "Scan"
msgstr "Escanear"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr "Tamaño del búfer de escaneo"
@@ -450,7 +460,7 @@ msgstr "Tamaño del búfer de escaneo"
msgid "Show/Hide QR-Codes"
msgstr "Mostrar/Ocultar códigos QR"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr "Umbral de calidad de señal"
@@ -531,7 +541,7 @@ msgstr "Versión de Travelmate"
msgid "Treat missing internet availability as an error."
msgstr "Trate la falta de disponibilidad de Internet como un error."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr "Retraso de disparo"
@@ -544,7 +554,7 @@ msgstr "Desconocido"
msgid "Up"
msgstr "Arriba"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "Interfaz de enlace / disparador"
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index b02d5c5f16..7a18b07f99 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -7,7 +7,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
@@ -21,6 +21,10 @@ msgstr "AP の場所:"
msgid "Action"
msgstr "アクション"
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr "オープンなアップリンクの追加"
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "アップリンクの追加"
@@ -29,7 +33,7 @@ msgstr "アップリンクの追加"
msgid "Add Wireless Uplink Configuration"
msgstr "無線アップリンク追加の設定"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間(秒)です。"
@@ -46,7 +50,7 @@ msgstr "認証"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
msgid "Auto Login Script"
-msgstr ""
+msgstr "自動ログイン スクリプト"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
@@ -55,7 +59,15 @@ msgstr ""
msgid "Automatic"
msgstr "自動"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+"ホテルのキャプティブ ポータルのような、オープンなアップリンクを自動的に無線設"
+"定に追加します。"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -75,7 +87,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "概要へ戻る"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr "スキャン結果を準備するためのバッファー サイズ (byte) です。"
@@ -105,7 +117,7 @@ msgid ""
msgstr ""
"トラベル ルーター機能を有効化するための、 Travelmate パッケージの設定です。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "接続制限"
@@ -173,7 +185,7 @@ msgstr "このアップリンクを編集"
msgid "Enable Travelmate"
msgstr "Travelmate の有効化"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "詳細なデバッグ ログの有効化"
@@ -194,8 +206,10 @@ msgid ""
"External script reference which will be called for automated captive portal "
"logins."
msgstr ""
+"キャプティブ ポータルへの自動ログインのために呼び出される、外部スクリプトへの"
+"参照です。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "拡張オプション"
@@ -240,7 +254,7 @@ msgstr "TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "TKIP と CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr "Travelmate が無線アップリンクへの接続成功を待つ時間です。"
@@ -261,7 +275,7 @@ msgstr "BSSID の無視"
msgid "Input file not found, please check your configuration."
msgstr "入力ファイルが見つかりません。設定を確認してください。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "インターフェース タイムアウト"
@@ -273,7 +287,7 @@ msgstr "インターフェース ウィザード"
msgid "Last Run"
msgstr "最終実行"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr "リストの自動期限切れ"
@@ -281,7 +295,7 @@ msgstr "リストの自動期限切れ"
msgid "Loading"
msgstr "読み込み中"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -297,7 +311,7 @@ msgstr "下へ"
msgid "Move up"
msgstr "上へ"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "使用されるアップリンク インターフェースの名前です。"
@@ -309,16 +323,16 @@ msgstr "ネット エラーチェック"
msgid "Open"
msgstr "オープン"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルトの設定が適切でない場合、さらに設定するためのオプションです。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "実行間隔"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr "全体的な再試行タイムアウト(秒)です。"
@@ -379,7 +393,7 @@ msgstr ""
"クを追加することができます。現在使用されているアップリンクは青色で、問題のあ"
"るステーションは赤色で強調されます。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr "無線の選択 / 順番"
@@ -396,7 +410,7 @@ msgstr "再起動"
msgid "Restart Travelmate"
msgstr "Travelmate の再起動"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
@@ -404,7 +418,7 @@ msgstr ""
"Travelmate を単一の無線(例: 'radio1')のみに制限したり、全体的なスキャンの順"
"番を変更します(例: 'radio1 radio2 radio0')。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr "アップリンクへの接続を試行する回数です。"
@@ -435,7 +449,7 @@ msgstr "保存"
msgid "Scan"
msgstr "スキャン:"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr "スキャンバッファー サイズ"
@@ -443,7 +457,7 @@ msgstr "スキャンバッファー サイズ"
msgid "Show/Hide QR-Codes"
msgstr "QR コードを表示/非表示"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr "シグナル品質閾値"
@@ -525,7 +539,7 @@ msgstr "Travelmate バージョン"
msgid "Treat missing internet availability as an error."
msgstr "インターネット可用性が無い場合をエラーとして扱います。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr "トリガ遅延"
@@ -538,7 +552,7 @@ msgstr "不明"
msgid "Up"
msgstr "上へ"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "アップリンク / トリガー インターフェース"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 4a324dd3e2..fd257abf46 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -21,6 +21,10 @@ msgstr ""
msgid "Action"
msgstr "Ação"
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "Adicionar Enlace para Fora"
@@ -29,7 +33,7 @@ msgstr "Adicionar Enlace para Fora"
msgid "Add Wireless Uplink Configuration"
msgstr "Adicionar Configuração Sem Fio de Enlace para Fora"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "Atraso adicional em segundos antes do travelmate processe os gatilhos."
@@ -55,7 +59,13 @@ msgstr ""
msgid "Automatic"
msgstr "Automático"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -73,7 +83,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "Voltar para visão geral"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
@@ -104,7 +114,7 @@ msgstr ""
"Configuração do travelmate para habilitar a funcionalidade de roteador de "
"viagem."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "Limite de conexão"
@@ -171,7 +181,7 @@ msgstr "Editar Configurações da Rede de saída"
msgid "Enable Travelmate"
msgstr "Habilitar o Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "Habilitar os registros de depuração detalhados"
@@ -193,7 +203,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "Opções adicionais"
@@ -238,7 +248,7 @@ msgstr "Forçar TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "Forçar TKIP e CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr ""
@@ -263,7 +273,7 @@ msgstr ""
"O arquivo entrado não foi encontrado. Por favor, verifique suas "
"configurações."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "Estouro de Tempo da Interface"
@@ -275,7 +285,7 @@ msgstr "Assistente da Interface"
msgid "Last Run"
msgstr "Última Execução"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr ""
@@ -283,7 +293,7 @@ msgstr ""
msgid "Loading"
msgstr "Carregando"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -299,7 +309,7 @@ msgstr "Mover para baixo"
msgid "Move up"
msgstr "Mover para cima"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "Nome da interface usada para o enlace de saída"
@@ -311,18 +321,18 @@ msgstr ""
msgid "Open"
msgstr "Abrir"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
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-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "Estouro de Tempo Global"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr "Estouro de tempo global em segundos."
@@ -381,7 +391,7 @@ msgstr ""
"escanear por um novo. O enlace em uso está destacado em azul, enquanto as "
"estações com falha estão em vermelho."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr ""
@@ -398,13 +408,13 @@ msgstr "Reiniciar"
msgid "Restart Travelmate"
msgstr "Reiniciar o Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr "Limite de retentativa de conexão com um enlace externo."
@@ -435,7 +445,7 @@ msgstr "Salvar"
msgid "Scan"
msgstr "Escanear"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr ""
@@ -443,7 +453,7 @@ msgstr ""
msgid "Show/Hide QR-Codes"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr "Limite da Qualidade do Sinal"
@@ -514,7 +524,7 @@ msgstr "Versão do Travelmate"
msgid "Treat missing internet availability as an error."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr "Atraso no Gatilho"
@@ -527,7 +537,7 @@ msgstr "Desconhecido"
msgid "Up"
msgstr "Acima"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "Enlace externo"
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index 91268f9110..4f1508c09e 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -24,6 +24,10 @@ msgstr ""
msgid "Action"
msgstr ""
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "Подключение к сети"
@@ -32,7 +36,7 @@ msgstr "Подключение к сети"
msgid "Add Wireless Uplink Configuration"
msgstr "Добавить настройку внешней беспроводной сети"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "Дополнительная задержка в секундах до запуска TravelMate."
@@ -58,7 +62,13 @@ msgstr ""
msgid "Automatic"
msgstr "Автоматически"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -76,7 +86,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "Назад в меню"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
@@ -103,7 +113,7 @@ msgid ""
"functionality."
msgstr "Настройка утилиты TravelMate - помощника путешественника. "
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "Ограничение соединений"
@@ -171,7 +181,7 @@ msgstr "Редактировать настройки сети"
msgid "Enable Travelmate"
msgstr "Включить Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "Включить подробное ведение журнала отладки"
@@ -193,7 +203,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "Дополнительные настройки"
@@ -238,7 +248,7 @@ msgstr "Назначить TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "Назначить TKIP и CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr ""
@@ -259,7 +269,7 @@ msgstr "Игнорировать BSSID"
msgid "Input file not found, please check your configuration."
msgstr "Config файл не найден, настройте config файл."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "Временная задержка интерфейса"
@@ -271,7 +281,7 @@ msgstr "Помощник настройки интерфейса"
msgid "Last Run"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr ""
@@ -279,7 +289,7 @@ msgstr ""
msgid "Loading"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -293,7 +303,7 @@ msgstr "Переместить вниз"
msgid "Move up"
msgstr "Переместить вверх"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "Имя используемого интерфейса внешней сети."
@@ -305,18 +315,18 @@ msgstr ""
msgid "Open"
msgstr "Открыть"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Возможные варианты детальной настройки, если значения по умолчанию не "
"подходят для вас."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "Общее время ожидания"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr ""
@@ -375,7 +385,7 @@ msgstr ""
"существующий список внешних сетей или выполнять их поиск. Используемое "
"сетевое соединение выделено синим цветом."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr ""
@@ -392,13 +402,13 @@ msgstr ""
msgid "Restart Travelmate"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr ""
@@ -429,7 +439,7 @@ msgstr "Сохранить"
msgid "Scan"
msgstr "Поиск"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr ""
@@ -437,7 +447,7 @@ msgstr ""
msgid "Show/Hide QR-Codes"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr ""
@@ -517,7 +527,7 @@ msgstr "Версия TravelMate"
msgid "Treat missing internet availability as an error."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr ""
@@ -530,7 +540,7 @@ msgstr "Неизвестно"
msgid "Up"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "Включить интерфейс<br />внешней сети"
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index f74433c7ae..01e70ba2a1 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -10,6 +10,10 @@ msgstr ""
msgid "Action"
msgstr ""
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr ""
@@ -18,7 +22,7 @@ msgstr ""
msgid "Add Wireless Uplink Configuration"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr ""
@@ -44,7 +48,13 @@ msgstr ""
msgid "Automatic"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -62,7 +72,7 @@ msgstr ""
msgid "Back to overview"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
@@ -89,7 +99,7 @@ msgid ""
"functionality."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr ""
@@ -155,7 +165,7 @@ msgstr ""
msgid "Enable Travelmate"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr ""
@@ -177,7 +187,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr ""
@@ -220,7 +230,7 @@ msgstr ""
msgid "Force TKIP and CCMP (AES)"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr ""
@@ -241,7 +251,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr ""
@@ -253,7 +263,7 @@ msgstr ""
msgid "Last Run"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr ""
@@ -261,7 +271,7 @@ msgstr ""
msgid "Loading"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -275,7 +285,7 @@ msgstr ""
msgid "Move up"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr ""
@@ -287,16 +297,16 @@ msgstr ""
msgid "Open"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr ""
@@ -351,7 +361,7 @@ msgid ""
"one. The currently used uplink is emphasized in blue, faulty stations in red."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr ""
@@ -368,13 +378,13 @@ msgstr ""
msgid "Restart Travelmate"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr ""
@@ -405,7 +415,7 @@ msgstr ""
msgid "Scan"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr ""
@@ -413,7 +423,7 @@ msgstr ""
msgid "Show/Hide QR-Codes"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr ""
@@ -483,7 +493,7 @@ msgstr ""
msgid "Treat missing internet availability as an error."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr ""
@@ -496,7 +506,7 @@ msgstr ""
msgid "Up"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr ""
diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
index 9e8f1a160a..de86739de2 100644
--- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
@@ -24,6 +24,10 @@ msgstr "AP 开启"
msgid "Action"
msgstr "动作"
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "添加上行连接"
@@ -32,7 +36,7 @@ msgstr "添加上行连接"
msgid "Add Wireless Uplink Configuration"
msgstr "添加无线上行连接配置"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "在 travelmate 处理开始前的额外触发延迟(秒)。"
@@ -58,7 +62,13 @@ msgstr ""
msgid "Automatic"
msgstr "自动"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -76,7 +86,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "返回概述"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
@@ -103,7 +113,7 @@ msgid ""
"functionality."
msgstr "配置 travelmate 包,以启用旅行路由器功能。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "连接限制"
@@ -169,7 +179,7 @@ msgstr "编辑此上行连接"
msgid "Enable Travelmate"
msgstr "启用 travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "启用详细调试日志"
@@ -191,7 +201,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "额外选项"
@@ -234,7 +244,7 @@ msgstr "强制 TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "强制 TKIP 和 CCMP(AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr "travelmate 等待 wlan 上行连接成功最长时间。"
@@ -255,7 +265,7 @@ msgstr "忽略 BSSID"
msgid "Input file not found, please check your configuration."
msgstr "未找到输入文件,请检查您的配置。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "接口超时"
@@ -267,7 +277,7 @@ msgstr "接口向导"
msgid "Last Run"
msgstr "上次运行"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr ""
@@ -275,7 +285,7 @@ msgstr ""
msgid "Loading"
msgstr "载入中"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -289,7 +299,7 @@ msgstr "下移"
msgid "Move up"
msgstr "上移"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "要使用的上行连接接口名称。"
@@ -301,16 +311,16 @@ msgstr ""
msgid "Open"
msgstr "开"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "如果默认值不适合您,可以选择进一步调整。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "总体超时"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr "总体重试超时(秒)。"
@@ -367,7 +377,7 @@ msgstr ""
"此处显示 travelmate 接口(%s)所有已配置上行连接的概述。您可以编辑、删除或重"
"新排序现有连接,或扫描新上行连接。当前使用的上行连接以蓝色突出显示。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr "无线电选择/顺序"
@@ -384,7 +394,7 @@ msgstr "重启"
msgid "Restart Travelmate"
msgstr "重启 Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
@@ -392,7 +402,7 @@ msgstr ""
"将 travelmate 限制在单个无线电上(例如“radio1”),或改变整个扫描顺序(例"
"如“radio1 radio2 radio0”)。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr "连接到上行连接的重试限制。"
@@ -423,7 +433,7 @@ msgstr "保存"
msgid "Scan"
msgstr "扫描"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr ""
@@ -431,7 +441,7 @@ msgstr ""
msgid "Show/Hide QR-Codes"
msgstr "显示/隐藏 QR 码"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr "信号质量阈值"
@@ -501,7 +511,7 @@ msgstr "Travelmate 版本"
msgid "Treat missing internet availability as an error."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr "触发延迟"
@@ -514,7 +524,7 @@ msgstr "未知"
msgid "Up"
msgstr "上"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "上行 / 触发接口"
diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
index b9c1e0c961..583e338dc5 100644
--- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
@@ -24,6 +24,10 @@ msgstr "AP 開啟"
msgid "Action"
msgstr "動作"
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "新增上行連線"
@@ -32,7 +36,7 @@ msgstr "新增上行連線"
msgid "Add Wireless Uplink Configuration"
msgstr "新增無線上行連線配置"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "在 travelmate 處理開始前的額外觸發延遲(秒)。"
@@ -58,7 +62,13 @@ msgstr ""
msgid "Automatic"
msgstr "自動"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
"Automatically resets the 'Faulty Stations' list after n minutes. Default is "
"'0' which means no expiry."
@@ -76,7 +86,7 @@ msgstr "BSSID"
msgid "Back to overview"
msgstr "返回概述"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
msgid "Buffer size in bytes to prepare nearby scan results."
msgstr ""
@@ -104,7 +114,7 @@ msgid ""
"functionality."
msgstr "配置 travelmate 包,以啟用旅行路由器功能。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
msgid "Connection Limit"
msgstr "連線限制"
@@ -170,7 +180,7 @@ msgstr "編輯此上行連線"
msgid "Enable Travelmate"
msgstr "啟用 travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
msgstr "啟用詳細除錯日誌"
@@ -192,7 +202,7 @@ msgid ""
"logins."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "額外選項"
@@ -235,7 +245,7 @@ msgstr "強制 TKIP"
msgid "Force TKIP and CCMP (AES)"
msgstr "強制 TKIP 和 CCMP(AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
"How long should travelmate wait for a successful wlan uplink connection."
msgstr "travelmate 等待 wlan 上行連線成功最長時間。"
@@ -256,7 +266,7 @@ msgstr "忽略 BSSID"
msgid "Input file not found, please check your configuration."
msgstr "未找到輸入檔案,請檢查您的配置。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
msgid "Interface Timeout"
msgstr "介面超時"
@@ -268,7 +278,7 @@ msgstr "介面嚮導"
msgid "Last Run"
msgstr "上次執行"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "List Auto Expiry"
msgstr ""
@@ -276,7 +286,7 @@ msgstr ""
msgid "Loading"
msgstr "載入中"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
"connections."
@@ -290,7 +300,7 @@ msgstr "下移"
msgid "Move up"
msgstr "上移"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
msgid "Name of the used uplink interface."
msgstr "要使用的上行連線介面名稱。"
@@ -302,16 +312,16 @@ msgstr ""
msgid "Open"
msgstr "開"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "如果預設值不適合您,可以選擇進一步調整。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
msgid "Overall Timeout"
msgstr "總體超時"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
msgid "Overall retry timeout in seconds."
msgstr "總體重試超時(秒)。"
@@ -368,7 +378,7 @@ msgstr ""
"此處顯示 travelmate 介面(%s)所有已配置上行連線的概述。您可以編輯、刪除或重"
"新排序現有連線,或掃描新上行連線。當前使用的上行連線以藍色突出顯示。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
msgid "Radio Selection / Order"
msgstr "無線電選擇/順序"
@@ -385,7 +395,7 @@ msgstr "重啟"
msgid "Restart Travelmate"
msgstr "重啟 Travelmate"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
@@ -393,7 +403,7 @@ msgstr ""
"將 travelmate 限制在單個無線電上(例如“radio1”),或改變整個掃描順序(例"
"如“radio1 radio2 radio0”)。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
msgid "Retry limit to connect to an uplink."
msgstr "連線到上行連線的重試限制。"
@@ -424,7 +434,7 @@ msgstr "儲存"
msgid "Scan"
msgstr "掃描"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
msgid "Scan Buffer Size"
msgstr ""
@@ -432,7 +442,7 @@ msgstr ""
msgid "Show/Hide QR-Codes"
msgstr "顯示/隱藏 QR 碼"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
msgid "Signal Quality Threshold"
msgstr "訊號質量閾值"
@@ -502,7 +512,7 @@ msgstr "Travelmate 版本"
msgid "Treat missing internet availability as an error."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid "Trigger Delay"
msgstr "觸發延遲"
@@ -515,7 +525,7 @@ msgstr "未知"
msgid "Up"
msgstr "上"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
msgid "Uplink / Trigger interface"
msgstr "上行 / 觸發介面"
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index f426acc537..2e26a5158e 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Stan Grishin (stangri@melmac.net)
+# Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
# This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk
@@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
LUCI_TITLE:=VPN Bypass Web UI
LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
-LUCI_DEPENDS:=+luci +vpnbypass
+LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
LUCI_PKGARCH:=all
-PKG_RELEASE:=4
+PKG_RELEASE:=9
include ../../luci.mk
diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
index ed6f4f4da4..56221e043f 100644
--- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
@@ -1,7 +1,10 @@
module("luci.controller.vpnbypass", package.seeall)
function index()
- if not nixio.fs.access("/etc/config/vpnbypass") then
- return
+ if nixio.fs.access("/etc/config/vpnbypass") then
+ if luci.dispatcher.lookup("admin/vpn") then
+ entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+ else
+ entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+ end
end
- entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
end
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
index 6545154c2c..95971fab1b 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -1,18 +1,40 @@
-readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md"
+local readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md"
m = Map("vpnbypass", translate("VPN Bypass Settings"))
-s = m:section(NamedSection, "config", "vpnbypass")
-
--- General options
-e = s:option(Flag, "enabled", translate("Start VPNBypass service"))
-e.rmempty = false
-function e.write(self, section, value)
- if value ~= "1" then
- luci.sys.init.stop("vpnbypass")
+
+h = m:section(NamedSection, "config", "vpnbypass", translate("Service Status"))
+local packageName = "vpnbypass"
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local http = require "luci.http"
+local dispatcher = require "luci.dispatcher"
+en = h:option(Button, "__toggle")
+if enabledFlag ~= "1" then
+ en.title = translate("Service is disabled/stopped")
+ en.inputtitle = translate("Enable/Start")
+ en.inputstyle = "apply important"
+else
+ en.title = translate("Service is enabled/started")
+ en.inputtitle = translate("Stop/Disable")
+ en.inputstyle = "reset important"
+end
+function en.write()
+ enabledFlag = enabledFlag == "1" and "0" or "1"
+ uci:set(packageName, "config", "enabled", enabledFlag)
+ uci:save(packageName)
+ uci:commit(packageName)
+ if enabledFlag == "0" then
+ sys.init.stop(packageName)
+ sys.init.disable(packageName)
+ else
+ sys.init.enable(packageName)
+ sys.init.start(packageName)
end
- return Flag.write(self, section, value)
+ http.redirect(dispatcher.build_url("admin/services/" .. packageName))
end
+s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules"))
+
-- Local Ports
p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass"))
p1.datatype = "portrange"
@@ -30,7 +52,7 @@ p2.optional = false
-- Local Subnets
r1 = s:option(DynamicList, "localsubnet", translate("Local IP Addresses to Bypass"), translate("Local IP addresses or subnets with direct internet access (outside of the VPN tunnel)"))
r1.datatype = "ip4addr"
--- r1.placeholder = luci.ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask"))
+-- r1.placeholder = ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask"))
r1.addremove = false
r1.optional = false
@@ -49,5 +71,8 @@ di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
translate("Domains to be accessed directly (outside of the VPN tunnel), see ")
.. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]]
.. translate("README") .. [[</a> ]] .. translate("for syntax"))
+function d.on_after_commit(map)
+ sys.init.restart("dnsmasq")
+end
return m, d