summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/luasrc/controller/adblock.lua14
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua210
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/runtime.htm34
-rw-r--r--applications/luci-app-adblock/po/es/adblock.po495
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po342
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po376
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po419
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po372
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po342
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot332
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po427
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po427
-rw-r--r--applications/luci-app-advanced-reboot/Makefile2
-rw-r--r--applications/luci-app-advanced-reboot/README.md5
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua4
-rw-r--r--applications/luci-app-advanced-reboot/po/es/advanced-reboot.po58
-rw-r--r--applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po50
-rw-r--r--applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po50
-rw-r--r--applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot50
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po50
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po50
-rw-r--r--applications/luci-app-aria2/po/es/aria2.po315
-rw-r--r--applications/luci-app-banip/luasrc/controller/banip.lua4
-rw-r--r--applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua177
-rw-r--r--applications/luci-app-banip/luasrc/view/banip/runtime.htm50
-rw-r--r--applications/luci-app-banip/po/es/banip.po250
-rw-r--r--applications/luci-app-banip/po/templates/banip.pot176
-rw-r--r--applications/luci-app-ddns/po/es/ddns.po14
-rw-r--r--applications/luci-app-dump1090/po/es/dump1090.po6
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js3
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js57
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js45
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm90
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm89
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm59
-rw-r--r--applications/luci-app-firewall/po/ca/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/cs/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/de/firewall.po474
-rw-r--r--applications/luci-app-firewall/po/el/firewall.po410
-rw-r--r--applications/luci-app-firewall/po/en/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/es/firewall.po442
-rw-r--r--applications/luci-app-firewall/po/fr/firewall.po422
-rw-r--r--applications/luci-app-firewall/po/he/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/hu/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/it/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/ja/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/ko/firewall.po422
-rw-r--r--applications/luci-app-firewall/po/ms/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/no/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/pl/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/pt-br/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/pt/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/ro/firewall.po419
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po474
-rw-r--r--applications/luci-app-firewall/po/sk/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/sv/firewall.po434
-rw-r--r--applications/luci-app-firewall/po/templates/firewall.pot401
-rw-r--r--applications/luci-app-firewall/po/tr/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po445
-rw-r--r--applications/luci-app-firewall/po/vi/firewall.po401
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po440
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po440
-rw-r--r--applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po10
-rw-r--r--applications/luci-app-mwan3/po/es/mwan3.po16
-rw-r--r--applications/luci-app-ntpc/po/es/ntpc.po14
-rw-r--r--applications/luci-app-ocserv/luasrc/controller/ocserv.lua10
-rw-r--r--applications/luci-app-ocserv/luasrc/view/ocserv_status.htm4
-rw-r--r--applications/luci-app-olsr-services/po/es/olsr-services.po4
-rw-r--r--applications/luci-app-openvpn/luasrc/controller/openvpn.lua12
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua34
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua2
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua6
-rw-r--r--applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm2
-rw-r--r--applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm8
-rw-r--r--applications/luci-app-openvpn/po/ca/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/cs/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/de/openvpn.po57
-rw-r--r--applications/luci-app-openvpn/po/el/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/en/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/es/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/fr/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/he/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/hu/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/it/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/ja/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/ms/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/no/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/pl/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/pt-br/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/pt/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/ro/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/ru/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/sk/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/sv/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/templates/openvpn.pot50
-rw-r--r--applications/luci-app-openvpn/po/tr/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/uk/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/vi/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/zh-cn/openvpn.po50
-rw-r--r--applications/luci-app-openvpn/po/zh-tw/openvpn.po50
-rw-r--r--applications/luci-app-simple-adblock/Makefile2
-rw-r--r--applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua115
-rw-r--r--applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua69
-rw-r--r--applications/luci-app-simple-adblock/po/es/simple-adblock.po324
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po291
-rw-r--r--applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po292
-rw-r--r--applications/luci-app-simple-adblock/po/pt/simple-adblock.po274
-rw-r--r--applications/luci-app-simple-adblock/po/ru/simple-adblock.po273
-rw-r--r--applications/luci-app-simple-adblock/po/sv/simple-adblock.po250
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot235
-rw-r--r--applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po288
-rw-r--r--applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po288
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua21
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua14
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua4
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua176
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua4
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua94
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua75
-rw-r--r--applications/luci-app-statistics/po/ca/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/cs/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/de/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/el/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/en/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/es/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/fr/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/he/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/hu/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/it/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/ja/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/ms/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/no/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/pl/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/pt-br/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/pt/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/ro/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/ru/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/sk/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/sv/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/templates/statistics.pot10
-rw-r--r--applications/luci-app-statistics/po/tr/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/uk/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/vi/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/zh-cn/statistics.po10
-rw-r--r--applications/luci-app-statistics/po/zh-tw/statistics.po10
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua13
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua25
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua30
-rw-r--r--applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm12
-rw-r--r--applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm8
-rw-r--r--applications/luci-app-travelmate/po/es/travelmate.po192
-rw-r--r--applications/luci-app-travelmate/po/ja/travelmate.po188
-rw-r--r--applications/luci-app-travelmate/po/pt-br/travelmate.po182
-rw-r--r--applications/luci-app-travelmate/po/ru/travelmate.po182
-rw-r--r--applications/luci-app-travelmate/po/templates/travelmate.pot182
-rw-r--r--applications/luci-app-travelmate/po/zh-cn/travelmate.po182
-rw-r--r--applications/luci-app-travelmate/po/zh-tw/travelmate.po182
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua8
-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
-rw-r--r--applications/luci-app-vpnbypass/po/de/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/es/vpnbypass.po62
-rw-r--r--applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/ru/vpnbypass.po51
-rw-r--r--applications/luci-app-vpnbypass/po/templates/vpnbypass.pot51
-rw-r--r--applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po51
-rw-r--r--applications/luci-app-wifischedule/po/es/wifischedule.po8
-rw-r--r--applications/luci-app-wireguard/po/es/wireguard.po4
171 files changed, 12448 insertions, 11208 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index d75296275..bee1d1439 100644
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -53,12 +53,6 @@ function adb_action(name, ...)
luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
elseif name == "do_refresh" then
luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
- local pid_file = "/var/run/adblock.pid"
- if nixio.fs.access(pid_file) then
- repeat
- nixio.nanosleep(1)
- until nixio.fs.readfile(pid_file) == ""
- end
elseif name == "do_report" then
luci.sys.call("/etc/init.d/adblock report " ..table.concat(report_params, " ").. " >/dev/null 2>&1")
local rep_dir = uci:get("adblock", "extra", "adb_repdir") or "/tmp"
@@ -90,6 +84,14 @@ function adb_action(name, ...)
end
end
end
+ if name == "do_suspend" or name == "do_resume" or name == "do_refresh" then
+ local pid_file = "/var/run/adblock.pid"
+ if nixio.fs.access(pid_file) then
+ repeat
+ nixio.nanosleep(1)
+ until nixio.fs.readfile(pid_file) == ""
+ end
+ end
luci.http.prepare_content("text/plain")
luci.http.write("0")
end
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 8e4395ae6..d6c5ac54c 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
@@ -28,36 +28,44 @@ o2:value("dnsmasq", "dnsmasq (/tmp)")
o2:value("unbound", "unbound (/var/lib/unbound)")
o2:value("named", "named (/var/lib/bind)")
o2:value("kresd", "kresd (/etc/kresd)")
-o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)")
o2.default = "dnsmasq (/tmp)"
o2.rmempty = false
-o3 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"),
- translate("List of supported and fully pre-configured download utilities."))
-o3:value("uclient-fetch")
-o3:value("wget")
-o3:value("curl")
-o3:value("aria2c")
-o3:value("wget-nossl", "wget-nossl (noSSL)")
-o3:value("busybox", "wget-busybox (noSSL)")
-o3.default = "uclient-fetch"
+o3 = s:option(ListValue, "adb_dnsvariant", translate("DNS Blocking Variant"),
+ translate("List of supported DNS blocking variants. By default 'nxdomain' will be used for all DNS backends. ")
+ ..translate("Dnsmasq also supports 'null' block variants, which may provide better response times."))
+o3:value("nxdomain", "nxdomain, all DNS backends")
+o3:value("null (IPv4)", "null (IPv4), dnsmasq only")
+o3:value("null (IPv4/IPv6)", "null (IPv4/IPv6), dnsmasq only")
+o3.default = "nxdomain, all DNS backends"
o3.rmempty = false
-o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
+o4 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"),
+ translate("List of supported and fully pre-configured download utilities."))
+o4:value("uclient-fetch")
+o4:value("wget")
+o4:value("curl")
+o4:value("aria2c")
+o4:value("wget-nossl", "wget-nossl (noSSL)")
+o4:value("busybox", "wget-busybox (noSSL)")
+o4.default = "uclient-fetch"
+o4.rmempty = false
+
+o5 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface. ")
..translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface."))
-o4:value("none")
-o4:value("timed")
+o5:value("none")
+o5:value("timed")
if dump then
local i, v
for i, v in ipairs(dump.interface) do
if v.interface ~= "loopback" then
local device = v.l3_device or v.device or "-"
- o4:value(v.interface, v.interface.. " (" ..device.. ")")
+ o5:value(v.interface, v.interface.. " (" ..device.. ")")
end
end
end
-o4.rmempty = false
+o5.rmempty = false
-- Runtime information
@@ -106,86 +114,98 @@ e2.enabled = "10"
e2.rmempty = false
e3 = e:option(Flag, "adb_forcedns", translate("Force Local DNS"),
- translate("Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp and tcp protocol on ports 53, 853 and 5353."))
+ translate("Redirect all DNS queries from 'lan' zone to the local resolver, applies to udp and tcp protocol on ports 53, 853 and 5353."))
e3.rmempty = false
-e4 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"),
- translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in backup mode."))
+e4 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
+ translate("Size of the download queue to handle downloads & list processing in parallel (default '4'). ")
+ ..translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
+e4.default = 4
+e4.datatype = "range(1,32)"
e4.rmempty = false
-e5 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
- translate("Target directory for adblock backups. Please use only a non-volatile disk, e.g. an external usb stick."))
-e5:depends("adb_backup", 1)
-e5.datatype = "directory"
-e5.default = "/mnt"
-e5.rmempty = true
+e5 = e:option(Flag, "adb_dnsfilereset", translate("DNS File Reset"),
+ translate("Resets the final DNS blockfile 'adb_list.overall' after loading through the DNS backend. ")
+ ..translate("This option saves an enormous amount of storage space, but starts a small ubus/adblock monitor in the background."))
+e5.disabled = "false"
+e5.enabled = "true"
+e5.rmempty = false
-e6 = e:option(Flag, "adb_backup_mode", translate("Backup Mode"),
- translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
-e6:depends("adb_backup", 1)
-e6.rmempty = true
-
-e7 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
- translate("Size of the download queue to handle downloads & list processing in parallel (default '8'). ")
- ..translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e7.default = 8
-e7.datatype = "range(1,32)"
-e7.rmempty = false
-
-e8 = e:option(Flag, "adb_report", translate("Enable DNS Query Report"),
+e6 = e:option(Flag, "adb_report", translate("DNS Query Report"),
translate("Gather dns related network traffic via tcpdump to provide a DNS Query Report on demand. ")
..translate("Please note: this needs manual 'tcpdump-mini' package installation."))
-e8.rmempty = false
-
-e9 = e:option(Value, "adb_repdir", translate("Report Directory"),
- translate("Target directory for dns related report files. Please use preferably a non-volatile disk, e.g. an external usb stick."))
-e9:depends("adb_report", 1)
-e9.datatype = "directory"
-e9.default = "/tmp"
+e6.rmempty = false
+
+e7 = e:option(Value, "adb_repdir", translate("Report Directory"),
+ translate("Target directory for dns related report files. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e7:depends("adb_report", 1)
+e7.datatype = "directory"
+e7.default = "/tmp"
+e7.rmempty = true
+
+e8 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
+ translate("Target directory for adblock source backups. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e8.datatype = "directory"
+e8.default = "/tmp"
+e8.rmempty = true
+
+e9 = e:option(Flag, "adb_mail", translate("E-Mail Notification"),
+ translate("Send notification E-Mails in case of a processing error or if domain count is ≤ 0. ")
+ .. translate("Please note: this needs manual 'msmtp' package installation and setup."))
e9.rmempty = true
-e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
- translate("Send notification emails in case of a processing error or if domain count is ≤ 0. ")
- .. translate("Please note: this needs manual 'msmtp' package installation and setup."))
+e10 = e:option(Value, "adb_mreceiver", translate("E-Mail Receiver Address"),
+ translate("Receiver address for adblock notification E-Mails."))
+e10:depends("adb_mail", 1)
e10.rmempty = true
-- Optional Extra Options
-e20 = e:option(Flag, "adb_jail", translate("'Jail' Blocklist Creation"),
- translate("Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all domains except those listed in the whitelist file. ")
- .. translate("You can use this restrictive blocklist e.g. for guest wifi or kidsafe configurations."))
+e20 = e:option(Value, "adb_dnsdir", translate("DNS Directory"),
+ translate("Target directory for the generated blocklist 'adb_list.overall'."))
+e20.datatype = "directory"
e20.optional = true
-e20.default = nil
-e21 = e:option(Value, "adb_notifycnt", translate("Email Notification Count"),
- translate("Raise the minimum email notification count, to get emails if the overall count is less or equal to the given limit (default 0), ")
- .. translate("e.g. to receive an email notification with every adblock update set this value to 150000."))
-e21.default = 0
-e21.datatype = "min(0)"
+e21 = e:option(Value, "adb_blacklist", translate("Blacklist File"),
+ translate("Full path to the blacklist file."))
+e21.datatype = "file"
+e21.default = "/etc/adblock/adblock.blacklist"
e21.optional = true
-e22 = e:option(Value, "adb_dnsdir", translate("DNS Directory"),
- translate("Target directory for the generated blocklist 'adb_list.overall'."))
-e22.datatype = "directory"
+e22 = e:option(Value, "adb_whitelist", translate("Whitelist File"),
+ translate("Full path to the whitelist file."))
+e22.datatype = "file"
+e22.default = "/etc/adblock/adblock.whitelist"
e22.optional = true
-e23 = e:option(Value, "adb_whitelist", translate("Whitelist File"),
- translate("Full path to the whitelist file."))
-e23.datatype = "file"
-e23.default = "/etc/adblock/adblock.whitelist"
+e23 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"),
+ translate("Additional trigger delay in seconds before adblock processing begins."))
+e23.datatype = "range(1,60)"
e23.optional = true
-e24 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"),
- translate("Additional trigger delay in seconds before adblock processing begins."))
-e24.datatype = "range(1,60)"
+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
-e25 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
- translate("Flush DNS Cache after adblock processing."))
+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
-e25.default = nil
-e26 = e:option(ListValue, "adb_repiface", translate("Report Interface"),
+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
@@ -194,32 +214,54 @@ if dump then
if v.interface ~= "loopback" then
local device = v.device
if device then
- e26:value(device)
+ e28:value(device)
end
end
end
end
-e26:value("any")
-e26.optional = true
+e28:value("any")
+e28.optional = true
-e27 = 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."))
-e27.default = 53
-e27.optional = true
+e29.default = 53
+e29.optional = true
-e28 = 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."))
-e28.datatype = "range(1,10)"
-e28.default = 5
-e28.optional = true
+e30.datatype = "range(1,10)"
+e30.default = 5
+e30.optional = true
-e29 = 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."))
-e29.datatype = "range(1,10)"
-e29.default = 1
-e29.optional = true
+e31.datatype = "range(1,10)"
+e31.default = 1
+e31.optional = true
+
+e32 = e:option(Value, "adb_msender", translate("E-Mail Sender Address"),
+ translate("Sender address for adblock notification E-Mails."))
+e32.default = "no-reply@adblock"
+e32.optional = true
+
+e33 = e:option(Value, "adb_mtopic", translate("E-Mail Topic"),
+ translate("Topic for adblock notification E-Mails."))
+e33.default = "adblock notification"
+e33.optional = true
+
+e34 = e:option(Value, "adb_mprofile", translate("E-Mail Profile"),
+ translate("Mail profile used in 'msmtp' for adblock notification E-Mails."))
+e34.default = "adb_notify"
+e34.optional = true
+
+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."))
+e35.default = 0
+e35.datatype = "min(0)"
+e35.optional = true
return m
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
index 72e2b0d36..2cec57334 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
@@ -1,11 +1,17 @@
<%#
-Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0
-%>
<%+adblock/adblock_css%>
<script type="text/javascript">
//<![CDATA[
+ function format(number)
+ {
+ var string = number.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1.');
+ return string;
+ }
+
function status_update(json)
{
var btn1 = document.getElementById("btn1");
@@ -50,8 +56,10 @@ This is free software, licensed under the Apache License, Version 2.0
document.getElementById("value_2").innerHTML = json.data.adblock_version || "-";
document.getElementById("value_3").innerHTML = json.data.fetch_utility || "-";
document.getElementById("value_4").innerHTML = json.data.dns_backend || "-";
- document.getElementById("value_5").innerHTML = json.data.overall_domains || "-";
- document.getElementById("value_6").innerHTML = json.data.last_rundate || "-";
+ document.getElementById("value_5").innerHTML = json.data.dns_variant || "-";
+ document.getElementById("value_6").innerHTML = json.data.backup_dir || "-";
+ document.getElementById("value_7").innerHTML = format(json.data.overall_domains) || "-";
+ document.getElementById("value_8").innerHTML = json.data.last_rundate || "-";
}
function btn_action(action)
@@ -110,6 +118,8 @@ This is free software, licensed under the Apache License, Version 2.0
document.getElementById("value_4").innerHTML = "-";
document.getElementById("value_5").innerHTML = "-";
document.getElementById("value_6").innerHTML = "-";
+ document.getElementById("value_7").innerHTML = "-";
+ document.getElementById("value_8").innerHTML = "-";
}
XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status_update")%>', null,
@@ -156,23 +166,35 @@ This is free software, licensed under the Apache License, Version 2.0
</div>
</div>
<div class="cbi-value" id="status_4">
- <label class="cbi-value-title" for="status_4"><%:DNS Backend (DNS Directory)%></label>
+ <label class="cbi-value-title" for="status_4"><%:DNS Backend, DNS Directory%></label>
<div class="cbi-value-field">
<span class="runtime" id="value_4">-</span>
</div>
</div>
<div class="cbi-value" id="status_5">
- <label class="cbi-value-title" for="status_5"><%:Overall Domains%></label>
+ <label class="cbi-value-title" for="status_5"><%:DNS Variant, DNS File Reset%></label>
<div class="cbi-value-field">
<span class="runtime" id="value_5">-</span>
</div>
</div>
<div class="cbi-value" id="status_6">
- <label class="cbi-value-title" for="status_6"><%:Last Run%></label>
+ <label class="cbi-value-title" for="status_6"><%:Backup Directory%></label>
<div class="cbi-value-field">
<span class="runtime" id="value_6">-</span>
</div>
</div>
+<div class="cbi-value" id="status_7">
+ <label class="cbi-value-title" for="status_7"><%:Overall Domains%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_7">-</span>
+ </div>
+</div>
+<div class="cbi-value" id="status_8">
+ <label class="cbi-value-title" for="status_8"><%:Last Run%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_8">-</span>
+ </div>
+</div>
<hr />
<div class="cbi-value" id="button_1">
<label class="cbi-value-title" for="button_1"><%:Suspend / Resume Adblock%></label>
diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index 08c8fd03b..a211af6d7 100644
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -3,20 +3,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-02-22 16:32-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Creación de listas de bloqueo 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -34,15 +30,15 @@ msgstr "Acción"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Estado de Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versión de Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Demora adicional del disparador en segundos antes de que comience el "
@@ -57,22 +53,23 @@ msgstr "Avanzado"
msgid "Answer"
msgstr "Responder"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "Categorías de archivo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Directorio de respaldo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "Lista negra"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr "Archivo de lista negra"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "Consultas DNS bloqueadas"
@@ -82,7 +79,7 @@ msgstr "Consultas DNS bloqueadas"
msgid "Blocked Domain"
msgstr "Dominio bloqueado"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fuentes de lista de bloqueo"
@@ -90,16 +87,7 @@ msgstr "Fuentes de lista de bloqueo"
msgid "Blocklist not found!"
msgstr "Lista de bloqueo no encontrado!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
-"acceso a todos los dominios, excepto los que figuran en el archivo de la "
-"lista blanca."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -133,44 +121,71 @@ msgstr ""
msgid "Count"
msgstr "Contar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en modo de copia de "
-"seguridad."
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS Backend (Directorio DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr "Servidor DNS, Directorio DNS"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr "Variante de bloqueo de DNS"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Directorio DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr "Restablecimiento de archivos 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 "Informe de consulta de DNS"
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr "Variante DNS, Restablecimiento de archivos DNS"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr "Fecha"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descripción"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"copias de seguridad de listas de bloqueo en su lugar."
+"Deshabilite los reinicios activados por adblock y el 'Restablecimiento de "
+"archivos DNS' para back-end dns con funciones de carga automática."
+
+#: 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 ""
+"Deshabilite la compresión de dominio de nivel superior, si el número de "
+"dominios bloqueados es mayor que este umbral."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
+"Dnsmasq también admite variantes de bloque 'nulo', que pueden proporcionar "
+"mejores tiempos de respuesta."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -183,14 +198,38 @@ msgstr "Dominio"
msgid "Domain/Client/Date/Time"
msgstr "Dominio/Cliente/Fecha/Hora"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Utilidad de descarga"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Utilidad de descarga (Biblioteca SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr "Notificación del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr "Conteo de notificaciones por E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr "Perfil del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Dirección del destinatario del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr "Dirección del remitente del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr "Tema del E-Mail"
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Editar lista negra"
@@ -203,33 +242,17 @@ msgstr "Editar configuración"
msgid "Edit Whitelist"
msgstr "Editar lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificación por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Recuento de notificaciones por Email"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Habilitar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista bloqueada"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "Habilitar informe de consulta de DNS"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilita el registro de depuración detallado en caso de cualquier error de "
"procesamiento."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Habilitado"
@@ -237,7 +260,7 @@ msgstr "Habilitado"
msgid "End Date"
msgstr "Fecha final"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opciones extra"
@@ -253,11 +276,11 @@ msgstr ""
"Filtrar el conjunto de resultados de la consulta de DNS para un dominio, "
"cliente o período de tiempo en particular."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Vaciar caché de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Vaciar el caché de DNS después del procesamiento de adblock."
@@ -269,7 +292,7 @@ msgstr ""
"Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
"documentación en línea</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -277,15 +300,19 @@ msgstr ""
"Para otras mejoras de rendimiento, puede aumentar este valor, por ejemplo, "
"'8' o '16' deben ser seguros."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Forzar DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr "Ruta completa al archivo de la lista negra."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "Ruta completa al archivo de la lista blanca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -299,7 +326,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Archivo de entrada no encontrado, por favor revise su configuración."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Último inicio"
@@ -307,7 +334,7 @@ msgstr "Último inicio"
msgid "Latest DNS Queries"
msgstr "Últimas consultas de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -322,26 +349,44 @@ msgstr ""
"Lista de backends DNS admitidos con su directorio de exportación de lista "
"predeterminado."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+"Lista de variantes de bloqueo de DNS compatibles. Por defecto, 'nxdomain' se "
+"usará para todos los servidores DNS."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"Lista de utilidades de descarga totalmente preconfiguradas y compatibles."
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
msgid "Loading"
msgstr "Cargando"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr "Puertos locales FW/DNS"
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
msgstr "Archivo de registro"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "Servicio con prioridad baja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+"Perfil de correo utilizado en 'msmtp' para notificaciones de E-Mails de "
+"adblock."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Cola máxima de descarga"
@@ -350,18 +395,18 @@ msgstr "Cola máxima de descarga"
msgid "Name / IP-Address"
msgstr "Nombre / Dirección IP"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opciones para ajustes adicionales en caso de que los valores predeterminados "
"no sean adecuados para usted."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Dominios generales"
@@ -385,13 +430,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Por favor, edite este archivo directamente en una sesión de terminal."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
"Tenga en cuenta: esto necesita la instalación y configuración del paquete "
"'msmtp' manual."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
"Tenga en cuenta: esto necesita la instalación manual del paquete 'tcpdump-"
@@ -405,31 +450,34 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Dominios de consulta"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"Aumente el recuento mínimo de notificaciones por correo electrónico para "
-"obtener correos electrónicos si el recuento general es menor o igual al "
-"límite dado (valor predeterminado 0),"
+"Aumente el recuento mínimo de notificaciones para obtener E-Mails si el "
+"recuento general es menor o igual al límite dado (valor predeterminado 0),"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr "Dirección del receptor para la notificación de bloqueos electrónicos."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"Redirije todas las consultas de DNS de la zona 'lan' a la resolución local, "
-"aplíquelas a los protocolos udp y tcp en los puertos 53, 853 y 5353."
+"Redireccionar todas las consultas DNS desde la zona 'lan' al resolvedor "
+"local, se aplica al protocolo udp y tcp en los puertos 53, 853 y 5353."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "Actualizar las fuentes de la lista de bloqueo"
@@ -437,38 +485,38 @@ msgstr "Actualizar las fuentes de la lista de bloqueo"
msgid "Refresh Report"
msgstr "Informe de actualización"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "Informe de recuento de fragmentos"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "Tamaño del fragmento de informe"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "Directorio de informes"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "Interfaz de informe"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr "Informe escuchar puerto(s)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:219
+#: 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:189
+#: 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')."
@@ -476,15 +524,23 @@ msgstr ""
"Interfaz de informes utilizada por tcpdump, establecida en 'any' para "
"múltiples interfaces (por defecto 'br-lan')."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+"Restablece el archivo de bloque DNS final 'adb_list.overall' después de "
+"cargarlo a través del backend de DNS."
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Reanudar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Información en tiempo de ejecución"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Requerimiento de SSL"
@@ -494,15 +550,19 @@ msgstr "Requerimiento de SSL"
msgid "Save"
msgstr "Guardar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-"Envía Emails de notificación en caso de un error de procesamiento o si el "
-"recuento de dominios es &le; 0."
+"Enviar notificaciones por E-Mail en caso de un error de procesamiento o si "
+"el recuento de dominios es &le 0."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr "Dirección del remitente para los E-Mails de notificación de adblock."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -510,15 +570,22 @@ msgstr ""
"Establezca el nivel agradable en 'prioridad baja' y el procesamiento en "
"segundo plano de Adblock tomará menos recursos del sistema."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
"Tamaño de la cola de descarga para manejar descargas &amp; procesamiento de "
-"listas en paralelo (por defecto '8')."
+"la lista en paralelo (predeterminado '4')."
+
+#: 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 ""
+"Lista de puertos de firewall separados por espacios que deben redirigirse "
+"localmente."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -529,37 +596,43 @@ msgstr ""
msgid "Start Date"
msgstr "Fecha de inicio"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Disparador de inicio"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr "Umbral de compresión de TLD"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"Directorio de destino para las copias de seguridad de Adblock. Utilice solo "
-"un disco no volátil, por ejemplo, una memoria usb externa."
+"Directorio de destino para copias de seguridad de origen de adblock. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"Directorio de destino para los archivos de informes relacionados con DNS. "
-"Utilice preferiblemente un disco no volátil, por ej. una memoria usb externa."
+"Directorio de destino para archivos de informes relacionados con dns. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
"Directorio de destino para la lista de bloqueo generada 'adb_list.overall'."
@@ -577,11 +650,11 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
"La salida de syslog, prefiltrada solo para mensajes relacionados con adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 "
@@ -617,6 +690,14 @@ msgstr ""
"Este formulario le permite consultar listas de bloqueo activas para ciertos "
"dominios, por ejemplo, para la lista blanca."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+"Esta opción ahorra una enorme cantidad de espacio de almacenamiento, pero "
+"inicia un pequeño monitor ubus/adblock en segundo plano."
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -634,15 +715,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "Top 10 de informes"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr "Tema para la notificación de bloqueos de E-Mails."
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "Total de consultas de DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Retraso de disparo"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registro de depuración detallado"
@@ -654,26 +739,118 @@ msgstr "Esperando que el comando se complete..."
msgid "Whitelist"
msgstr "Lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Archivo de lista blanca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Si"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr ""
-"Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
-"configuraciones de wifi de invitados o para niños."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"P.ej. para recibir una notificación por email con cada actualización de "
-"Adblock, establezca este valor en 150000."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
+"p.ej. para recibir una notificación por E-Mail con cada ejecución de bloque "
+"de anuncios, establezca este valor en 200000."
+
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Creación de listas de bloqueo 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
+#~ "acceso a todos los dominios, excepto los que figuran en el archivo de la "
+#~ "lista blanca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en modo de copia de "
+#~ "seguridad."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "copias de seguridad de listas de bloqueo en su lugar."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificación por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Recuento de notificaciones por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista bloqueada"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "Habilitar informe de consulta de DNS"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "Aumente el recuento mínimo de notificaciones por correo electrónico para "
+#~ "obtener correos electrónicos si el recuento general es menor o igual al "
+#~ "límite dado (valor predeterminado 0),"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "Redirije todas las consultas de DNS de la zona 'lan' a la resolución "
+#~ "local, aplíquelas a los protocolos udp y tcp en los puertos 53, 853 y "
+#~ "5353."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Envía Emails de notificación en caso de un error de procesamiento o si el "
+#~ "recuento de dominios es &le; 0."
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr ""
+#~ "Tamaño de la cola de descarga para manejar descargas &amp; procesamiento "
+#~ "de listas en paralelo (por defecto '8')."
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de Adblock. Utilice "
+#~ "solo un disco no volátil, por ejemplo, una memoria usb externa."
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para los archivos de informes relacionados con DNS. "
+#~ "Utilice preferiblemente un disco no volátil, por ej. una memoria usb "
+#~ "externa."
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr ""
+#~ "Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
+#~ "configuraciones de wifi de invitados o para niños."
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "P.ej. para recibir una notificación por email con cada actualización de "
+#~ "Adblock, establezca este valor en 150000."
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 9ea78f2c0..f9c267638 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -11,11 +11,7 @@ msgstr ""
"X-Generator: Poedit 2.0.3\n"
"Language: it\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -31,15 +27,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Status Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versione Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
@@ -52,22 +48,23 @@ msgstr "Avanzato"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Directory del Backup"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -77,7 +74,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fonti lista di Blocco"
@@ -85,13 +82,7 @@ msgstr "Fonti lista di Blocco"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -124,41 +115,65 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Directory DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descrizione"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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 ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"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 "
+"response times."
msgstr ""
-"Non aggiornare automaticamente le liste durante l'avvio, usa invece i backup "
-"della lista di blocco."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -171,14 +186,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Modifica Lista Nera"
@@ -191,32 +230,16 @@ msgstr "Modifica Configurazione"
msgid "Edit Whitelist"
msgstr "Modifica Lista Bianca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Attiva Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Attiva Backup Lista di Blocco"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Abilita il registro dettagliato in caso di qualsiasi errore di processo."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Abilitato"
@@ -224,7 +247,7 @@ msgstr "Abilitato"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opzioni Extra"
@@ -238,11 +261,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -252,21 +275,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Forza DNS Locale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -278,7 +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:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Ultimo Avvio"
@@ -286,7 +313,7 @@ msgstr "Ultimo Avvio"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -297,25 +324,39 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -324,18 +365,18 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opzioni per ulteriori modifiche in caso che quelle di default non ti sono "
"adatte."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -359,11 +400,11 @@ msgid "Please edit this file directly in a terminal session."
msgstr ""
"Per favore modifica questo file direttamente in una sessione al terminale."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -375,26 +416,30 @@ msgstr "Interrogazione"
msgid "Query domains"
msgstr "Interrogazione domini"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -402,49 +447,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Riprendi"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Informazione di Runtime"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Ric. SSL"
@@ -454,25 +505,34 @@ msgstr "Ric. SSL"
msgid "Save"
msgstr "Salva"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:206
+#: 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 ""
@@ -481,33 +541,37 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Innesco d'Avvio"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
@@ -521,11 +585,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 ""
@@ -555,6 +619,12 @@ msgstr ""
"Questo form ti consente di interrogare le liste di blocco attive per "
"determinati domini, p.e. per metterli nella lista bianca."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -572,15 +642,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Ritardo Innesco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registro di Debug Dettagliato"
@@ -592,25 +666,29 @@ msgstr "Aspettando che il comando venga completato..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Sì"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Non aggiornare automaticamente le liste durante l'avvio, usa invece i "
+#~ "backup della lista di blocco."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Attiva Backup Lista di Blocco"
#~ msgid "Force Overall Sort"
#~ msgstr "Forza Ordinamento Globale"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 74efb52df..dd8c8af14 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,14 +8,10 @@ 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"
"Language: ja\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Jail' ブロックリストの作成"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -33,15 +29,15 @@ msgstr "アクション"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock ステータス"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock バージョン"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Adblock の処理が開始されるまでの、追加の遅延時間(秒)です。"
@@ -54,22 +50,23 @@ msgstr "詳細設定"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "アーカイブ カテゴリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "バックアップ先 ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "バックアップ モード"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "ブラックリスト"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr "ブラックリスト ファイル"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "ブロックされた DNS クエリ"
@@ -79,7 +76,7 @@ msgstr "ブロックされた DNS クエリ"
msgid "Blocked Domain"
msgstr "ブロックされたドメイン"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "ブロックリスト提供元"
@@ -87,15 +84,7 @@ msgstr "ブロックリスト提供元"
msgid "Blocklist not found!"
msgstr "ブロックリストが見つかりません!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の "
-"'Jail' リスト (/tmp/adb_list.jail) を作成します。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -129,44 +118,70 @@ msgstr ""
msgid "Count"
msgstr "カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"圧縮されたブロックリストのバックアップを作成します。これは、リストのダウン"
-"ロードがエラーの場合、またはバックアップ モードでサービスを起動した場合に使用"
-"されます。"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS バックエンド(DNS ディレクトリ)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr "DNS バックエンド, DNS ディレクトリ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr "DNS ブロック種別"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS ディレクトリ"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr "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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr "DNS 種別, DNS ファイル リセット"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr "日付"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "説明"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"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 "
+"response times."
+msgstr ""
+"Dnsmasq は、より応答時間に優れることがあるブロック種別 'null' も提供します。"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -179,14 +194,38 @@ msgstr "ドメイン"
msgid "Domain/Client/Date/Time"
msgstr "ドメイン / クライアント / 日付 / 時刻"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "ダウンロード ユーティリティ(SSL ライブラリ)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr "Eメール通知"
+
+#: 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:255
+msgid "E-Mail Profile"
+msgstr "Eメール プロファイル"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr "Eメール受信アドレス"
+
+#: 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:250
+msgid "E-Mail Topic"
+msgstr "Eメール題名"
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "ブラックリストの編集"
@@ -199,32 +238,16 @@ msgstr "設定の編集"
msgid "Edit Whitelist"
msgstr "ホワイトリストの編集"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "メール通知"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "メール通知カウント"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Adblock の有効化"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "ブロックリスト バックアップの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "DNS クエリ レポートの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"何らかの処理エラーが発生した場合に、詳細なデバッグ ログを有効にします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "有効"
@@ -232,7 +255,7 @@ msgstr "有効"
msgid "End Date"
msgstr "終了日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "拡張オプション"
@@ -248,11 +271,11 @@ msgstr ""
"DNS クエリの結果セットを、指定したドメインやクライアント、日時によってフィル"
"タします。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "DNS キャッシュのクリア"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
@@ -264,7 +287,7 @@ msgstr ""
"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
"確認してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -272,15 +295,19 @@ msgstr ""
"パフォーマンスの更なる改善のため、安全と思われる '8' や '16' などの値に引き上"
"げることができます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "ローカル DNS の強制"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr "ブラックリスト ファイルへのフルパスです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "ホワイトリスト ファイルへのフルパスです。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -294,7 +321,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "入力ファイルが見つかりません。設定を確認してください。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最終実行"
@@ -302,7 +329,7 @@ msgstr "最終実行"
msgid "Latest DNS Queries"
msgstr "最新の DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -317,25 +344,42 @@ msgstr ""
"サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で"
"す。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+"DNS ブロック種別の一覧です。デフォルトの 'nxdomain' は全ての DNS バックエンド"
+"に使用されます。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 "ログファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低優先度サービス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+"adblock 通知メールのために 'msmtp' で使用される、メール プロファイルです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "ダウンロード キューの上限"
@@ -344,16 +388,16 @@ msgstr "ダウンロード キューの上限"
msgid "Name / IP-Address"
msgstr "名前 / IP アドレス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "いいえ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "全体のドメイン"
@@ -377,13 +421,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "ターミナル セッションで直接このファイルを編集してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
"注意: これは手動での 'msmtp' パッケージのインストールとセットアップを必要とし"
"ます。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
"注意: これは手動での 'tcpdump-mini' パッケージのインストールを必要とします。"
@@ -396,30 +440,34 @@ msgstr "検索"
msgid "Query domains"
msgstr "ドメインの検索"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"メール通知を行うメール通知カウントの下限値を設定します。全体カウントが指定さ"
-"れた値以下の場合、メールを受け取ります(規定値: 0)。"
+"メール通知を行うメール通知カウントを設定します。全体カウントが指定された値以"
+"下の場合、メールを受け取ります。(規定値: 0)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr "adblock 通知メールの受信アドレスです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
"'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ"
"は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "ブロックリスト提供元のリフレッシュ"
@@ -427,35 +475,35 @@ msgstr "ブロックリスト提供元のリフレッシュ"
msgid "Refresh Report"
msgstr "レポートをリフレッシュ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "レポート チャンクカウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "レポート チャンクサイズ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "レポート ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "レポート インターフェース"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr "レポート待ち受けポート"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump により使用される、レポートチャンク数です。(規定値: '5')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:189
+#: 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')."
@@ -463,15 +511,23 @@ msgstr ""
"tcpdump により使用される、レポートを行うインターフェースです。複数のインター"
"フェースを使用するには、 'any' を設定してください。(規定値: 'br-lan')"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+"最終的な DNS ブロックファイル 'adb_list.overall' を、DNS バックエンドを通して"
+"読み込み後にリセットします。"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "再開"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
-msgstr "実行情報"
+msgstr "ランタイム情報"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 必須"
@@ -481,14 +537,18 @@ msgstr "SSL 必須"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
"処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr "adblock 通知メールの送信アドレスです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -496,15 +556,22 @@ msgstr ""
"nice値(優先度)を '低優先度' に設定し、adblock バックグラウンド処理のシステ"
"ムリソース使用量を抑制します。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
msgstr ""
"ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ"
-"ズです。(規定値: '8')"
+"ズです。(規定値: '4')"
+
+#: 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:206
+#: 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 ""
@@ -515,37 +582,41 @@ msgstr ""
msgid "Start Date"
msgstr "開始日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "スタートアップ トリガ"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用して"
-"ください。(例: 外部 USB スティック)"
+"adblock ソースをバックアップする対象ディレクトリです。デフォルトは '/tmp' で"
+"すが、可能であれば不揮発性ディスクを使用して下さい。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"DNS 関連レポートファイルの保存先ディレクトリです。可能であれば不揮発性ディス"
-"クを使用してください。(例: 外部 USB スティック)"
+"DNS 関連レポート ファイルの保存先ディレクトリです。デフォルトは '/tmp' です"
+"が、可能であれば不揮発性ディスクを使用してください。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成されたブロックリスト 'adb_list.overall' の保存先ディレクトリです。"
@@ -561,11 +632,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。"
@@ -599,6 +670,14 @@ msgstr ""
"このフォームでは、現在有効なリスト内で特定のドメインを検索することができま"
"す。例: ホワイトリスト内"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+"このオプションはストレージ容量の大きな節約となりますが、バックグラウンドで小"
+"さな ubus/adblock モニターを開始します。"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -616,15 +695,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr "上位 10 レポート"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr "adblock 通知メールの題名です。"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "総 DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "トリガ遅延"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "詳細なデバッグ ログ"
@@ -636,25 +719,18 @@ msgstr "コマンド実行中です..."
msgid "Whitelist"
msgstr "ホワイトリスト"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "ホワイトリスト ファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "はい"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-"この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに手"
-"動で利用することができます。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。"
+"例: adblock の実行ごとに Eメール通知を受け取るには、値を 200000 に設定しま"
+"す。"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index e0d2d790f..e524951c1 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -12,11 +12,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Enjaule' Criação de Lista Negra"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -34,15 +30,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Estado do Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Versão do Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Atraso de gatilho adicional em segundos antes do processamento do adblock "
@@ -57,22 +53,23 @@ msgstr "Avançado"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "Categorias Arquivadas"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de Backup"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -82,7 +79,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Fontes de listas de bloqueio"
@@ -90,15 +87,7 @@ msgstr "Fontes de listas de bloqueio"
msgid "Blocklist not found!"
msgstr "Lista preta não encontrada!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a todos "
-"os domínios exceto aqueles listados na lista branca."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -132,44 +121,65 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
-"usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
-"backup."
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "Serviço DNS (Diretório DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Diretório DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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 ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"Não atualize as listas de bloqueio automaticamente durante o início, use o "
-"backup das listas como alternativa."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -182,14 +192,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Utilitário de Download (Biblioteca SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Editar Lista de Bloqueio"
@@ -202,33 +236,17 @@ msgstr "Editar Configuração"
msgid "Edit Whitelist"
msgstr "Editar Lista Permitida"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificação por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Quantidade para Notificação por Email"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Habilitar adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar cópia de segurança da lista de bloqueio"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilita os registros de depuração detalhados em caso de qualquer erro de "
"processamento."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Habilitado"
@@ -236,7 +254,7 @@ msgstr "Habilitado"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Opções adicionais"
@@ -250,11 +268,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Limpar cache DNS depois do processamento do adblock."
@@ -266,7 +284,7 @@ msgstr ""
"Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
"externa</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -274,15 +292,19 @@ msgstr ""
"Para melhoramentos no desempenho, você pode aumentar este valor (ex: '8' ou "
"'16' deve ser seguro)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Force o DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "Caminho completo para a lista branca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -294,7 +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:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Última Execução"
@@ -302,7 +324,7 @@ msgstr "Última Execução"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -317,25 +339,39 @@ msgstr ""
"Lista dos serviços DNS suportados com seu diretório padrão de exportação de "
"lista."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr "Lista de ferramentas suportadas para baixar listas."
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "Serviço de Baixa Prioridade"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Tamanho Máximo da Fila"
@@ -344,18 +380,18 @@ msgstr "Tamanho Máximo da Fila"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Não"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Opções para aprimoramentos adicionais caso as opções padrão não sejam "
"suficientes para você."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Domínios Globais"
@@ -379,11 +415,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Por favor edite esse arquivo direto em uma sessão de terminal."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -395,30 +431,30 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Consulta de domínios"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"Aumente a quantidade mínima para notificar por email para receber mensagens "
-"se a contagem total for menos ou igual a este limite (padrão 0)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"Redirecione todas as requisições DNS da zona 'LAN' para o servidor local. "
-"Aplica-se aos protocolos UDP e TCP nas portas 53, 853 e 5353."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "Atualizar as Fontes de Lista Negra"
@@ -426,49 +462,55 @@ msgstr "Atualizar as Fontes de Lista Negra"
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Continuar"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Informação de execução"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Req. de SSL"
@@ -478,15 +520,17 @@ msgstr "Req. de SSL"
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-"Enviar notificações por email se ocorrer um erro de processamento ou se a "
-"contagem por domínio for menor que 0."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
@@ -494,13 +538,20 @@ msgstr ""
"Define o nível de prioridade para 'baixa', reduzindo o impacto do "
"processamento em segundo plano do adblock no seu sistema."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+"Tamanho da fila responsável por baixar e processamento em paralelo (padrão "
+"'4')."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:206
+#: 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 ""
@@ -509,33 +560,37 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Gatilho de Iniciação"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Diretório para a lista nega gerada 'adb_list.overall'."
@@ -550,11 +605,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Mensagens do syslog relacionadas ao adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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."
@@ -584,6 +639,12 @@ msgstr ""
"Esse formulário permite que você consulte listas de blocos ativos para "
"certos domínios, e.x. para listas de permissão."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -601,15 +662,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Atraso no gatilho"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Registros de Depuração Detalhados"
@@ -621,27 +686,84 @@ msgstr "Aguardando por comando para completar..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Lista Branca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Sim"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"ex: para receber notificação por email a cada atualização do adblock, ajuste "
-"este valor para 150000."
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "'Enjaule' Criação de Lista Negra"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de Backup"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a "
+#~ "todos os domínios exceto aqueles listados na lista branca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
+#~ "usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
+#~ "backup."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Não atualize as listas de bloqueio automaticamente durante o início, use "
+#~ "o backup das listas como alternativa."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificação por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Quantidade para Notificação por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar cópia de segurança da lista de bloqueio"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "Aumente a quantidade mínima para notificar por email para receber "
+#~ "mensagens se a contagem total for menos ou igual a este limite (padrão 0)."
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "Redirecione todas as requisições DNS da zona 'LAN' para o servidor local. "
+#~ "Aplica-se aos protocolos UDP e TCP nas portas 53, 853 e 5353."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Enviar notificações por email se ocorrer um erro de processamento ou se a "
+#~ "contagem por domínio for menor que 0."
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "ex: para receber notificação por email a cada atualização do adblock, "
+#~ "ajuste este valor para 150000."
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
@@ -658,13 +780,6 @@ msgstr ""
#~ msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'."
#~ msgid ""
-#~ "Size of the download queue to handle downloads &amp; list processing in "
-#~ "parallel (default '4')."
-#~ msgstr ""
-#~ "Tamanho da fila responsável por baixar e processamento em paralelo "
-#~ "(padrão '4')."
-
-#~ msgid ""
#~ "Target directory for adblock backups. Please use only non-volatile disks, "
#~ "e.g. an external usb stick."
#~ msgstr ""
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index a1ac817ba..4218abc69 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Создание Черного<br />списка 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -37,15 +33,15 @@ msgstr ""
msgid "Adblock"
msgstr "AdBlock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Состояние Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Версия Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Дополнительная задержка в секундах до начала работы Adblock."
@@ -58,22 +54,23 @@ msgstr "Дополнительно"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Папка для бэкапа"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Режим сохранения бекапа"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -83,7 +80,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Источники списков блокировок"
@@ -91,13 +88,7 @@ msgstr "Источники списков блокировок"
msgid "Blocklist not found!"
msgstr "Список блокировок не найден!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -131,43 +122,65 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Создание сжатых резервных копий списков блокировок, они будут использоваться "
-"в случае ошибок загрузки или при запуске в ручном режиме."
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS бэкенд (папка DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "Папка DNS"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Описание"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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 ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
msgstr ""
-"Не обновлять списки блокировок автоматически во время запуска, вместо этого "
-"использовать резервные копии списков блокировок."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -180,14 +193,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "Утилита для скачивания"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Утилита для скачивания (с библиотекой SSL)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Редактировать Черный список"
@@ -200,31 +237,15 @@ msgstr "Редактировать config файл"
msgid "Edit Whitelist"
msgstr "Редактировать Белый список"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email уведомления"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Кол-во email уведомлений"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Включить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Бэкап списка блокировок"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Включено"
@@ -232,7 +253,7 @@ msgstr "Включено"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Дополнительные настройки"
@@ -246,11 +267,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "Очистка DNS-кэша после обработки Adblock-ом."
@@ -262,7 +283,7 @@ msgstr ""
"<br />Для получения дополнительной информации <a href=\"%s\" target=\"_blank"
"\"> смотрите онлайн документацию</a>."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -270,15 +291,19 @@ msgstr ""
"Для дополнительного повышения производительности вы можете увеличить это "
"значение, например значения '8' или '16' должны быть безопасными."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Локальный DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого списка."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -290,7 +315,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr "Config файл не найден, настройте config файл."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Последний запуск"
@@ -298,7 +323,7 @@ msgstr "Последний запуск"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -309,7 +334,13 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"Список поддерживаемых и полностью предварительно настроенных утилит для "
@@ -317,19 +348,27 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "Максимальная очередь загрузки"
@@ -338,18 +377,18 @@ msgstr "Максимальная очередь загрузки"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Нет"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
"Возможные варианты детальной настройки, если значения по умолчанию не "
"подходят для вас."
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "Всего доменов"
@@ -372,11 +411,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Редактируйте данный файл только в терминале."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -388,26 +427,30 @@ msgstr "Запрос"
msgid "Query domains"
msgstr "Запрос доменов"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -415,49 +458,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Возобновить"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Информация о состоянии"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "Запрос SSL"
@@ -467,25 +516,34 @@ msgstr "Запрос SSL"
msgid "Save"
msgstr "Сохранить"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:206
+#: 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 ""
@@ -494,33 +552,37 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Триггер запуска"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Папка для созданного списка блокировки 'adb_list.overall'."
@@ -536,11 +598,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 ""
@@ -570,6 +632,12 @@ msgstr ""
"Данное поле позволяет запросить домены для конкретных списков, например для "
"Белого списка."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -587,15 +655,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "Задержка запуска"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "Подробный журнал отладки"
@@ -607,27 +679,55 @@ msgstr "Ожидание завершения выполнения команд
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "Файл Белого списка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Да"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"например, чтобы получать email уведомления при каждом обновлении Adblock-а "
-"установите значение 150000."
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Создание Черного<br />списка 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Режим сохранения бекапа"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Создание сжатых резервных копий списков блокировок, они будут "
+#~ "использоваться в случае ошибок загрузки или при запуске в ручном режиме."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Не обновлять списки блокировок автоматически во время запуска, вместо "
+#~ "этого использовать резервные копии списков блокировок."
+
+#~ msgid "Email Notification"
+#~ msgstr "Email уведомления"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Кол-во email уведомлений"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Бэкап списка блокировок"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "например, чтобы получать email уведомления при каждом обновлении Adblock-"
+#~ "а установите значение 150000."
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 31ce45ba1..5d6ea6577 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -1,11 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -21,15 +17,15 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Status för Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Version av Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,22 +38,23 @@ msgstr "Avancerat"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "Källor för blockeringslistor"
@@ -75,13 +72,7 @@ msgstr "Källor för blockeringslistor"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -115,41 +106,65 @@ msgstr ""
msgid "Count"
msgstr "Räkna"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS-bakände (DNS-mapp)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS-mapp"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "Beskrivning"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"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 "
+"response times."
msgstr ""
-"Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
-"säkerhetskopierade blockeringslistor istället."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -162,14 +177,38 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "Nerladdningsprogram (SSL-bibliotek)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "Redigera svartlista"
@@ -182,31 +221,15 @@ msgstr "Redigerar konfigurationen"
msgid "Edit Whitelist"
msgstr "Redigera vitlista"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Aktivera adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Aktivera säkerhetskopiering av blockeringslistan"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "Aktiverad"
@@ -214,7 +237,7 @@ msgstr "Aktiverad"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "Extra alternativ"
@@ -228,11 +251,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -242,21 +265,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "Tvinga lokal DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -269,7 +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:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "Kördes senast"
@@ -277,7 +304,7 @@ msgstr "Kördes senast"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -288,25 +315,39 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -315,16 +356,16 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "Nej"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -345,11 +386,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Vänligen redigera den här filen direkt i en terminal-session."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -361,26 +402,30 @@ msgstr "Fråga"
msgid "Query domains"
msgstr "Fråga efter domäner"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -388,49 +433,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "Återuppta"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "Information om körtid"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL-rek."
@@ -440,25 +491,34 @@ msgstr "SSL-rek."
msgid "Save"
msgstr "Spara"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:206
+#: 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 ""
@@ -467,33 +527,37 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "Uppstartslösare"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -507,11 +571,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 ""
@@ -539,6 +603,12 @@ msgid ""
"for whitelisting."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -554,15 +624,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr ""
@@ -574,25 +648,29 @@ msgstr "Väntar på att kommandot ska slutföras..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "Ja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
+#~ "säkerhetskopierade blockeringslistor istället."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Aktivera säkerhetskopiering av blockeringslistan"
#~ msgid "View Logfile"
#~ msgstr "Visa loggfil"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index f6ef16821..6f8466332 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -1,11 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -21,15 +17,15 @@ msgstr ""
msgid "Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,22 +38,23 @@ msgstr ""
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr ""
@@ -75,13 +72,7 @@ msgstr ""
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -110,38 +101,64 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"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 "
+"response times."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
@@ -155,51 +172,59 @@ msgstr ""
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
-msgid "Edit Blacklist"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
-msgid "Edit Configuration"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
-msgid "Edit Whitelist"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
-msgid "Enable Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+msgid "Edit Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
+msgid "Edit Configuration"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
+msgid "Edit Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
+msgid "Enable Adblock"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr ""
@@ -207,7 +232,7 @@ msgstr ""
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr ""
@@ -221,11 +246,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr ""
@@ -235,21 +260,25 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -261,7 +290,7 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr ""
@@ -269,7 +298,7 @@ msgstr ""
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -280,25 +309,39 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr ""
@@ -307,16 +350,16 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr ""
@@ -337,11 +380,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -353,26 +396,30 @@ msgstr ""
msgid "Query domains"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr ""
@@ -380,49 +427,55 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
msgid ""
"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
"(default 'br-lan')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr ""
@@ -432,25 +485,34 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:206
+#: 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 ""
@@ -459,33 +521,37 @@ msgstr ""
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -499,11 +565,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 ""
@@ -529,6 +595,12 @@ msgid ""
"for whitelisting."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -544,15 +616,19 @@ msgstr ""
msgid "Top 10 Reporting"
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr ""
@@ -564,22 +640,16 @@ msgstr ""
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
msgstr ""
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 9d189215e..31b1dba65 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”拦截列表创建"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -37,15 +33,15 @@ msgstr "动作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock 状态"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "触发 Adblock 开始处理前的额外延迟(秒)。"
@@ -58,22 +54,23 @@ msgstr "高级"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "存档类别"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "备份目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "备份模式"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "黑名单"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已拦截的 DNS 请求"
@@ -83,7 +80,7 @@ msgstr "已拦截的 DNS 请求"
msgid "Blocked Domain"
msgstr "已拦截的域名"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "拦截列表来源"
@@ -91,15 +88,7 @@ msgstr "拦截列表来源"
msgid "Blocklist not found!"
msgstr "拦截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"构建一个额外的“Jail”列表(/tmp/adb_list.jail),除白名单文件中列出的域名外,"
-"阻止访问其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,65 @@ msgstr "Adblock 配置工具,通过 DNS 来拦截广告和阻止域名。"
msgid "Count"
msgstr "计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 后端(DNS 目录)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS 目录"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr "日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份。"
+"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 "
+"response times."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +190,38 @@ msgstr "域名"
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "下载工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "下载实用程序(SSL 库)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "编辑黑名单"
@@ -195,31 +234,15 @@ msgstr "编辑设置"
msgid "Edit Whitelist"
msgstr "编辑白名单"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒计数"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "启用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "启用 Blocklist 备份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "启用 DNS 查询报告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "已启用"
@@ -227,7 +250,7 @@ msgstr "已启用"
msgid "End Date"
msgstr "结束日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "额外选项"
@@ -241,11 +264,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程启动后清空 DNS 缓存。"
@@ -255,21 +278,25 @@ msgid ""
"documentation</a>"
msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "为了进一步提高性能,您可以提高此值,例如:8 或 16 应该是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "强制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "白名单文件的全路径。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -281,7 +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:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最后运行"
@@ -289,7 +316,7 @@ msgstr "最后运行"
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查询"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -300,25 +327,39 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支持的 DNS 后端列表及其默认列表导出目录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr "支持和完全预配置的下载工具列表。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 "日志文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低优先级服务"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "最大下载队列"
@@ -327,16 +368,16 @@ msgstr "最大下载队列"
msgid "Name / IP-Address"
msgstr "名称 / IP 地址"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在默认设置并不适合您时的额外选项。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "域名总览"
@@ -359,11 +400,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "请在终端会话中直接编辑此文件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr "请注意:这需要手动安装和设置“msmtp”软件包。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr "请注意:这需要手动安装和设置“tcpdump-mini”软件包。"
@@ -375,30 +416,30 @@ msgstr "查询"
msgid "Query domains"
msgstr "查询域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电子"
-"邮件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"将所有 DNS 查询从“lan”区域重定向到本地解析器,适用于端口53、853和5353上的 "
-"udp 和 tcp 协议。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "刷新拦截列表源"
@@ -406,49 +447,55 @@ msgstr "刷新拦截列表源"
msgid "Refresh Report"
msgstr "刷新报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "报告区块计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "报告区块大小"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "报告目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "报告接口"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 将使用的报告区块计数(默认为“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:189
+#: 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')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "恢复"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "运行信息"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 要求"
@@ -458,25 +505,34 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "保存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。"
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr "设置 nice 级别为“低优先级”,adblock 后台进程将从系统中获取更少的资源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "处理下载队列的大小及并行处理列表(默认为“8”)。"
+"parallel (default '4')."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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 ""
@@ -485,34 +541,37 @@ msgstr ""
msgid "Start Date"
msgstr "开始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "启动触发器"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"dns 相关报告文件的目标目录。请优先使用非易失性磁盘,例如:一个外置 U 盘。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成拦截列表“adb_list.overall”的目标目录。"
@@ -526,11 +585,11 @@ msgstr "文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系统日志输出,仅针对 adblock 相关的消息进行了预筛选。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 "此更改需要手动停止/重启服务才能生效。"
@@ -556,6 +615,12 @@ msgid ""
"for whitelisting."
msgstr "此表单允许您查询某些域的活动块列表,例如用于列出白名单。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -571,15 +636,19 @@ msgstr "要覆盖默认路径,请使用下面额外部分中的“DNS 目录
msgid "Top 10 Reporting"
msgstr "前十报告"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查询总数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "触发延迟"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "详细的调试记录"
@@ -591,25 +660,99 @@ msgstr "正在等待命令完成…"
msgid "Whitelist"
msgstr "白名单"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "白名单文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性拦截列表,例如访客 wifi 或家长模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”拦截列表创建"
+
+#~ msgid "Backup Mode"
+#~ msgstr "备份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "构建一个额外的“Jail”列表(/tmp/adb_list.jail),除白名单文件中列出的域名"
+#~ "外,阻止访问其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模式启动期间使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒计数"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "启用 Blocklist 备份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "启用 DNS 查询报告"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "如果总数小于或等于给定限制(默认为 0),请提高最小电子邮件通知数,以获取电"
+#~ "子邮件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "将所有 DNS 查询从“lan”区域重定向到本地解析器,适用于端口53、853和5353上的 "
+#~ "udp 和 tcp 协议。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果发生错误或域计数 &le; 0,发送通知电子邮件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "处理下载队列的大小及并行处理列表(默认为“8”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘,例如:一个外置 U 盘。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相关报告文件的目标目录。请优先使用非易失性磁盘,例如:一个外置 U 盘。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性拦截列表,例如访客 wifi 或家长模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index ddcb76a1e..3940343e9 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”攔截列表建立"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -37,15 +33,15 @@ msgstr "動作"
msgid "Adblock"
msgstr "Adblock"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
msgid "Adblock Status"
msgstr "Adblock 狀態"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "觸發 Adblock 開始處理前的額外延遲(秒)。"
@@ -58,22 +54,23 @@ msgstr "高階"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
msgid "Archive Categories"
msgstr "存檔類別"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
msgid "Backup Directory"
msgstr "備份目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "備份模式"
-
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
msgstr "黑名單"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已攔截的 DNS 請求"
@@ -83,7 +80,7 @@ msgstr "已攔截的 DNS 請求"
msgid "Blocked Domain"
msgstr "已攔截的域名"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
msgid "Blocklist Sources"
msgstr "攔截列表來源"
@@ -91,15 +88,7 @@ msgstr "攔截列表來源"
msgid "Blocklist not found!"
msgstr "攔截列表未找到!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"構建一個額外的“Jail”列表(/tmp/adb_list.jail),除白名單檔案中列出的域名外,"
-"阻止訪問其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,65 @@ msgstr "Adblock 配置工具,通過 DNS 來攔截廣告和阻止域名。"
msgid "Count"
msgstr "計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模式啟動期間使用。"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 後端(DNS 目錄)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
msgstr "DNS 目錄"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/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:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
msgstr "日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Description"
msgstr "描述"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份。"
+"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 "
+"response times."
+msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +190,38 @@ msgstr "域名"
msgid "Domain/Client/Date/Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
msgid "Download Utility"
msgstr "下載工具"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
msgid "Download Utility (SSL Library)"
msgstr "下載實用程式(SSL 庫)"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+msgid "E-Mail Profile"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-Mail Receiver Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
msgstr "編輯黑名單"
@@ -195,31 +234,15 @@ msgstr "編輯設定"
msgid "Edit Whitelist"
msgstr "編輯白名單"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒計數"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "啟用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "啟用 Blocklist 備份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "啟用 DNS 查詢報告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
msgid "Enabled"
msgstr "已啟用"
@@ -227,7 +250,7 @@ msgstr "已啟用"
msgid "End Date"
msgstr "結束日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid "Extra Options"
msgstr "額外選項"
@@ -241,11 +264,11 @@ msgid ""
"frame."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
msgid "Flush DNS Cache"
msgstr "清空 DNS 快取"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 程序啟動後清空 DNS 快取。"
@@ -255,21 +278,25 @@ msgid ""
"documentation</a>"
msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "為了進一步提高效能,您可以提高此值,例如:8 或 16 應該是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Force Local DNS"
msgstr "強制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
msgstr "白名單檔案的全路徑。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -281,7 +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:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
msgid "Last Run"
msgstr "最後執行"
@@ -289,7 +316,7 @@ msgstr "最後執行"
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查詢"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -300,25 +327,39 @@ msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
msgstr "支援和完全預配置的下載工具列表。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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 "日誌檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid "Low Priority Service"
msgstr "低優先順序服務"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
msgstr "最大下載佇列"
@@ -327,16 +368,16 @@ msgstr "最大下載佇列"
msgid "Name / IP-Address"
msgstr "名稱 / IP 地址"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
msgid "No"
msgstr "否"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在預設設定並不適合您時的額外選項。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
msgid "Overall Domains"
msgstr "域名總覽"
@@ -359,11 +400,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "請在終端會話中直接編輯此檔案。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr "請注意:這需要手動安裝和設定“msmtp”軟體包。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr "請注意:這需要手動安裝和設定“tcpdump-mini”軟體包。"
@@ -375,30 +416,30 @@ msgstr "查詢"
msgid "Query domains"
msgstr "查詢域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"Raise the minimum notification count, to get E-Mails if the overall count is "
+"less or equal to the given limit (default 0),"
msgstr ""
-"如果總數小於或等於給定限制(預設為 0),請提高最小電子郵件通知數,以獲取電子"
-"郵件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+msgid "Receiver address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
-"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"將所有 DNS 查詢從“lan”區域重定向到本地解析器,適用於埠53、853和5353上的 udp "
-"和 tcp 協議。"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
msgid "Refresh Blocklist Sources"
msgstr "重新整理攔截列表源"
@@ -406,49 +447,55 @@ msgstr "重新整理攔截列表源"
msgid "Refresh Report"
msgstr "重新整理報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
msgid "Report Chunk Count"
msgstr "報告區塊計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
msgid "Report Chunk Size"
msgstr "報告區塊大小"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
msgid "Report Directory"
msgstr "報告目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
msgid "Report Interface"
msgstr "報告介面"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump 將使用的報告區塊計數(預設為“5”)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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:189
+#: 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')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
msgstr "恢復"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
msgid "Runtime Information"
msgstr "執行資訊"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
msgid "SSL req."
msgstr "SSL 要求"
@@ -458,26 +505,35 @@ msgstr "SSL 要求"
msgid "Save"
msgstr "儲存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果發生錯誤或域計數 &le; 0,傳送通知電子郵件。"
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take fewer resources from the system."
msgstr ""
"設定 nice 級別為“低優先順序”,adblock 後臺程序將從系統中獲取更少的資源。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "處理下載佇列的大小及並行處理列表(預設為“8”)。"
+"parallel (default '4')."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua: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 ""
@@ -486,34 +542,37 @@ msgstr ""
msgid "Start Date"
msgstr "開始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
msgid "Startup Trigger"
msgstr "啟動觸發器"
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm: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:178
+#: 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:117
+#: 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 backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
msgstr ""
-"dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟,例如:一個外接 U 盤。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生成攔截列表“adb_list.overall”的目標目錄。"
@@ -527,11 +586,11 @@ msgstr "檔案過大,無法使用 LuCI 的線上編輯(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系統日誌輸出,僅針對 adblock 相關的訊息進行了預篩選。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: 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 "此更改需要手動停止/重啟服務才能生效。"
@@ -557,6 +616,12 @@ msgid ""
"for whitelisting."
msgstr "此表單允許您查詢某些域的活動塊列表,例如用於列出白名單。"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
@@ -572,15 +637,19 @@ msgstr "要覆蓋預設路徑,請使用下面額外部分中的“DNS 目錄
msgid "Top 10 Reporting"
msgstr "前十報告"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查詢總數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
msgid "Trigger Delay"
msgstr "觸發延遲"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
msgid "Verbose Debug Logging"
msgstr "詳細的除錯記錄"
@@ -592,25 +661,99 @@ msgstr "正在等待指令完成…"
msgid "Whitelist"
msgstr "白名單"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
msgid "Whitelist File"
msgstr "白名單檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性攔截列表,例如訪客 wifi 或家長模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”攔截列表建立"
+
+#~ msgid "Backup Mode"
+#~ msgstr "備份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "構建一個額外的“Jail”列表(/tmp/adb_list.jail),除白名單檔案中列出的域名"
+#~ "外,阻止訪問其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模式啟動期間使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒計數"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "啟用 Blocklist 備份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "啟用 DNS 查詢報告"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "如果總數小於或等於給定限制(預設為 0),請提高最小電子郵件通知數,以獲取電"
+#~ "子郵件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "將所有 DNS 查詢從“lan”區域重定向到本地解析器,適用於埠53、853和5353上的 "
+#~ "udp 和 tcp 協議。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果發生錯誤或域計數 &le; 0,傳送通知電子郵件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "處理下載佇列的大小及並行處理列表(預設為“8”)。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟,例如:一個外接 U 盤。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟,例如:一個外接 U 盤。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性攔截列表,例如訪客 wifi 或家長模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
#~ msgid ""
#~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index 2a7df3bd1..329acece4 100644
--- a/applications/luci-app-advanced-reboot/Makefile
+++ b/applications/luci-app-advanced-reboot/Makefile
@@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
LUCI_DEPENDS:=+luci-mod-admin-full
LUCI_PKGARCH:=all
-PKG_RELEASE:=40
+PKG_RELEASE:=42
include ../../luci.mk
diff --git a/applications/luci-app-advanced-reboot/README.md b/applications/luci-app-advanced-reboot/README.md
index 781a1c7f7..61e43637d 100644
--- a/applications/luci-app-advanced-reboot/README.md
+++ b/applications/luci-app-advanced-reboot/README.md
@@ -12,6 +12,7 @@ Currently supported dual-partition devices include:
- Linksys E4200v2
- Linksys EA4500
- Linksys EA6350v3
+- Linksys EA8300
- Linksys EA8500
- Linksys WRT1200AC
- Linksys WRT1900AC
@@ -36,6 +37,8 @@ opkg update
opkg install luci-app-advanced-reboot
```
+If the ```luci-app-advanced-reboot``` package is not found in the official feed/repo for your version of OpenWrt/LEDE Project, you will need to [add a custom repo to your router](https://github.com/stangri/openwrt_packages/blob/master/README.md#on-your-router) first.
+
## Notes/Known Issues
- When you reboot to a different partition, your current settings (WiFi SSID/password, etc.) will not apply to a different partition. Different partitions might have completely different settings and even firmware.
@@ -44,4 +47,4 @@ opkg install luci-app-advanced-reboot
## Thanks
-I'd like to thank everyone who helped create, test and troubleshoot this package. Without help from [@hnyman](https://github.com/hnyman), [@jpstyves](https://github.com/jpstyves), [@imi2003](https://github.com/imi2003) and many contributions from [@slh](https://github.com/pkgadd) it wouldn't have been possible.
+I'd like to thank everyone who helped create, test and troubleshoot this package. Without help from [@hnyman](https://github.com/hnyman), [@jpstyves](https://github.com/jpstyves), [@imi2003](https://github.com/imi2003), [@jeffsf](https://github.com/jeffsf) and many contributions from [@slh](https://github.com/pkgadd) it wouldn't have been possible.
diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
index f40eac50c..733242486 100644
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -8,6 +8,7 @@ devices = {
{"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
{"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
{"Linksys EA6350v3", "linksys-ea6350v3", "mtd10", "mtd12", 192, "boot_part", 1, 2},
+ {"Linksys EA8300", "linksys-ea8300", "mtd10", "mtd12", 192, "boot_part", 1, 2},
{"Linksys EA8500", "ea8500", "mtd13", "mtd15", 32, "boot_part", 1, 2},
-- {"Linksys EA9500", "linksys-panamera", "mtd3", "mtd6", 28, "boot_part", 1, 2},
{"Linksys WRT1200AC", "linksys-caiman", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
@@ -87,10 +88,11 @@ end
function action_reboot()
local uci = require "luci.model.uci".cursor()
+ local ip = uci:get("network", "lan", "ipaddr")
luci.template.render("admin_system/applyreboot", {
title = luci.i18n.translate("Rebooting..."),
msg = luci.i18n.translate("The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
- addr = luci.ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1"
+ addr = luci.ip.new(type(ip) == "string" and ip or "192.168.1.1") or "192.168.1.1"
})
luci.sys.reboot()
end
diff --git a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
index 3c46e4d61..582848fa5 100644
--- a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:29-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -16,7 +16,7 @@ msgstr ""
msgid "Action"
msgstr "Acción"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr "Reinicio avanzado"
@@ -49,7 +49,7 @@ msgstr "ERROR:"
msgid "Firmware/OS (Kernel)"
msgstr "Firmware"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "Sin acceso a fw_printenv o fw_printenv!"
@@ -81,19 +81,19 @@ msgstr "Reinicie el dispositivo a una partición alternativa"
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:50
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:74
msgid "Reboot to alternative partition..."
-msgstr "Reiniciar a partición alternativa ..."
+msgstr "Reiniciar a la partición alternativa ..."
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:45
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:69
msgid "Reboot to current partition"
msgstr "Reiniciar a la partición actual"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Reiniciando..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Apagando..."
@@ -101,7 +101,7 @@ msgstr "Apagando..."
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -113,7 +113,7 @@ msgstr ""
"sea necesario renovar la dirección de su computadora para llegar al "
"dispositivo nuevamente, dependiendo de su configuración."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
"computadora para llegar al dispositivo nuevamente, dependiendo de su "
"configuración."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -136,31 +136,31 @@ msgstr ""
"Puede que sea necesario renovar la dirección de su computadora para llegar "
"al dispositivo nuevamente, dependiendo de la configuración."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "No se puede encontrar la partición de bandera de arranque dual."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "No se puede obtener la variable de entorno de firmware"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
"No se puede establecer la entrada de la partición del indicador de inicio "
"dual para la partición"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "No se puede establecer la variable de entorno de firmware"
@@ -214,9 +214,9 @@ msgstr "Advertencia: ¡Este sistema no admite el apagado!"
msgid "Warning: Unable to obtain device information!"
msgstr "Advertencia: ¡No se puede obtener información del dispositivo!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "a"
diff --git a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
index b1f742b9f..5d66917ed 100644
--- a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
@@ -17,7 +17,7 @@ msgstr ""
msgid "Action"
msgstr "Действие"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr "Дополнительная перезагрузка"
@@ -50,7 +50,7 @@ msgstr "ОШИБКА:"
msgid "Firmware/OS (Kernel)"
msgstr "Прошивка/ОС (Ядро)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "Нет доступа к fw_printenv или fw_printenv!"
@@ -89,12 +89,12 @@ msgstr "Перезагрузить до альтернативного разд
msgid "Reboot to current partition"
msgstr "Перезагрузка к текущему разделу"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Перезагрузка..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Отключается..."
@@ -102,7 +102,7 @@ msgstr "Отключается..."
msgid "Status"
msgstr "Состояние"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -114,7 +114,7 @@ msgstr ""
"снова. Возможно, потребуется обновить адрес компьютера для повторного "
"доступа к устройству в зависимости от ваших настроек."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
"установить соединение снова. Возможно, потребуется обновить адрес компьютера "
"для повторного доступа к устройству в зависимости от ваших настроек."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -136,29 +136,29 @@ msgstr ""
"Возможно, потребуется обновить адрес компьютера для повторного доступа к "
"устройству в зависимости от настроек."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "Невозможно найти Dual Boot раздел."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "Невозможно получить переменную среды прошивки"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "Невозможно использовать Dual Boot раздел."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "Невозможно установить переменную среды прошивки"
@@ -211,10 +211,10 @@ msgstr "Внимание: Эта система не поддерживает о
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
index 97582e0fd..a793c24e9 100644
--- a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "Action"
msgstr "Åtgärd"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr "Avancerad omstart"
@@ -38,7 +38,7 @@ msgstr ""
msgid "Firmware/OS (Kernel)"
msgstr "Inre mjukvara/OS (Kärna)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr ""
@@ -77,12 +77,12 @@ msgstr "Starta om till alternativ partition..."
msgid "Reboot to current partition"
msgstr "Starta om till nuvarande partition"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Startar om..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Stänger av..."
@@ -90,7 +90,7 @@ msgstr "Stänger av..."
msgid "Status"
msgstr "Status"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
"settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,7 +106,7 @@ msgid ""
"again, depending on your settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -116,29 +116,29 @@ msgstr ""
"inställningar så kan det vara nödvändigt att förnya din dators adress för "
"att nå enheten igen."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr ""
@@ -181,10 +181,10 @@ msgstr "Varning: Det här systemet har inte stöd för avstängning!"
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
index c6ca42850..ab1ef12ff 100644
--- a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
+++ b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Action"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr ""
@@ -38,7 +38,7 @@ msgstr ""
msgid "Firmware/OS (Kernel)"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr ""
@@ -77,12 +77,12 @@ msgstr ""
msgid "Reboot to current partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
"settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,36 +106,36 @@ msgid ""
"again, depending on your settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
"again, depending on your settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr ""
@@ -174,9 +174,9 @@ msgstr ""
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
index 4b66d3bf0..a9a20e493 100644
--- a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Action"
msgstr "动作"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr "高级重启"
@@ -48,7 +48,7 @@ msgstr "错误:"
msgid "Firmware/OS (Kernel)"
msgstr "固件/OS(内核)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "无法访问 fw_printenv 或 fw_printenv!"
@@ -87,12 +87,12 @@ msgstr "重启到备用分区…"
msgid "Reboot to current partition"
msgstr "重启到当前分区"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "正在重启…"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "正在关机…"
@@ -100,7 +100,7 @@ msgstr "正在关机…"
msgid "Status"
msgstr "状态"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
"系统正在重启。<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br />等待数分"
"钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
"<br />等待数分钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重"
"新连接。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -130,29 +130,29 @@ msgstr ""
"系统现在正在关机。<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br />等待"
"数分钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "无法找到双引导标志分区。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "无法获取固件环境变量"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "无法为分区设置双引导标志分区项"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "无法设置固件环境变量"
@@ -197,9 +197,9 @@ msgstr "警告:此系统不支持关闭电源!"
msgid "Warning: Unable to obtain device information!"
msgstr "警告:无法获取设备信息!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "至"
diff --git a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
index b820de9a0..0ddcec8fd 100644
--- a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
@@ -15,7 +15,7 @@ msgstr ""
msgid "Action"
msgstr "動作"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
msgid "Advanced Reboot"
msgstr "高階重啟"
@@ -48,7 +48,7 @@ msgstr "錯誤:"
msgid "Firmware/OS (Kernel)"
msgstr "韌體/OS(核心)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "無法訪問 fw_printenv 或 fw_printenv!"
@@ -87,12 +87,12 @@ msgstr "重啟到備用分割槽…"
msgid "Reboot to current partition"
msgstr "重啟到當前分割槽"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "正在重啟…"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "正在關機…"
@@ -100,7 +100,7 @@ msgstr "正在關機…"
msgid "Status"
msgstr "狀態"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
"系統正在重啟。<br />切勿關閉電源! DO NOT POWER OFF THE DEVICE!<br />等待數分"
"鍾後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 位址以重新連線。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
"DEVICE!<br />等待數分鐘後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 地"
"址以重新連線。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -130,29 +130,29 @@ msgstr ""
"系統現在正在關機。<br />切勿關閉電源! DO NOT POWER OFF THE DEVICE!<br />等待"
"數分鐘後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 位址以重新連線。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "無法找到雙引導標誌分割槽。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "無法獲取韌體環境變數"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "無法為分割槽設定雙引導標誌分割槽項"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "無法設定韌體環境變數"
@@ -198,9 +198,9 @@ msgstr "警告:此係統不支援關閉電源!"
msgid "Warning: Unable to obtain device information!"
msgstr "警告:無法獲取裝置資訊!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "至"
diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index 61bd523d1..275f1b82d 100644
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:29-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.2\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -19,19 +19,19 @@ msgstr ""
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
msgid "Additional BT tracker"
-msgstr ""
+msgstr "Tracker BT adicional"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones avanzadas"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
msgid "All proxy"
-msgstr ""
+msgstr "Todos los proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
msgid "Append HEADERs to HTTP request header."
-msgstr ""
+msgstr "Añadir encabezados al encabezado de solicitud HTTP."
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
@@ -45,18 +45,19 @@ msgid ""
"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
"download utility."
msgstr ""
+"Aria2 es un multiprotocolo ligero &amp; utilidad de descarga multiplataforma."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
msgid "Auto save interval"
-msgstr ""
+msgstr "Intervalo de guardado automático"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
msgid "Basic Options"
-msgstr ""
+msgstr "Opciones avanzadas"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
msgid "BitTorrent Options"
-msgstr ""
+msgstr "Opciones de BitTorrent"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
msgid "BitTorrent listen port"
@@ -64,21 +65,23 @@ msgstr "BitTorrent escucha puerto"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
msgid "CA certificate"
-msgstr ""
+msgstr "Certificado CA"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
msgid "Certificate"
-msgstr ""
+msgstr "Certificado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
msgid "Check certificate"
-msgstr ""
+msgstr "Comprobar certificado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
msgid ""
"Close connection if download speed is lower than or equal to this "
"value(bytes per sec). 0 means has no lowest speed limit."
msgstr ""
+"Cierre la conexión si la velocidad de descarga es menor o igual a este valor "
+"(bytes por segundo). 0 significa que no tiene límite de velocidad mínima."
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
@@ -91,23 +94,23 @@ msgstr "Directorio de archivos de configuración"
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
msgid "Connect timeout"
-msgstr ""
+msgstr "Tiempo de espera de conexión"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
msgid "Content of config file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de configuración: <code>%s</code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
msgid "Content of session file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de sesión: <code>%s</code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
msgid "DHT Listen port"
-msgstr ""
+msgstr "Puerto de DHT"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
msgid "Debug"
@@ -118,6 +121,8 @@ msgid ""
"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
"terribly slow AAAA record lookup."
msgstr ""
+"Deshabilitar IPv6. Esto es útil si tiene que usar DNS roto y desea evitar "
+"una búsqueda de registros AAAA terriblemente lenta."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
msgid "Disk cache"
@@ -126,51 +131,54 @@ msgstr "Caché de disco"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
msgstr ""
+"No divida menos de 2*TAMAÑO de rango de bytes. Valores posibles: 1M-1024M."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
msgid "Download a file using N connections."
-msgstr ""
+msgstr "Descargue un archivo usando N conexiones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
msgid "Download directory"
-msgstr ""
+msgstr "Directorio de descarga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
msgid "Empty file."
-msgstr ""
+msgstr "Archivo vacío."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
msgstr ""
+"Habilite la funcionalidad DHT IPv4. También habilita el soporte de tracker "
+"UDP."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
msgid "Enable IPv6 DHT functionality."
-msgstr ""
+msgstr "Habilite la funcionalidad DHT IPv6 ."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
msgid "Enable Local Peer Discovery."
-msgstr ""
+msgstr "Habilitar el descubrimiento de pares locales."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
msgid "Enable Peer Exchange extension."
-msgstr ""
+msgstr "Habilite la extensión de intercambio de pares."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
msgid "Enable disk cache (in bytes), set 0 to disabled."
-msgstr ""
+msgstr "Habilite el caché de disco (en bytes), establezca 0 para deshabilitar."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
msgid "Enable logging"
-msgstr ""
+msgstr "Habilitar el registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
msgid "Enable peer exchange"
-msgstr ""
+msgstr "Habilitar el intercambio entre pares"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
msgid "Enable proxy"
-msgstr ""
+msgstr "Habilitar proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
msgid "Enabled"
@@ -182,7 +190,7 @@ msgstr "Error"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
-msgstr ""
+msgstr "Error: no se puede encontrar aria2c en PATH, reinstale aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
msgid "Extra Settings"
@@ -190,25 +198,25 @@ msgstr "Configuraciones extra"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
msgid "Failed to load log data."
-msgstr ""
+msgstr "Error al cargar los datos del registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
msgid "False"
-msgstr ""
+msgstr "Falso"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
msgid "File allocation"
-msgstr ""
+msgstr "Asignación de archivos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
msgid "File does not exist."
-msgstr ""
+msgstr "El archivo no existe."
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
msgid "Files"
-msgstr ""
+msgstr "Archivos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
msgid "Follow torrent"
@@ -216,11 +224,11 @@ msgstr "Seguir torrent"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
msgid "For more information, please visit: %s"
-msgstr ""
+msgstr "Para obtener más información, visite: %s"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
msgid "Force save"
-msgstr ""
+msgstr "Forzar guardado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
msgid "Generate Randomly"
@@ -228,35 +236,35 @@ msgstr "Generar aleatoriamente"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
msgid "HTTP accept gzip"
-msgstr ""
+msgstr "HTTP acepta gzip"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
msgid "HTTP no cache"
-msgstr ""
+msgstr "HTTP sin caché"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
msgid "HTTP/FTP/SFTP Options"
-msgstr ""
+msgstr "Opciones HTTP/FTP/SFTP"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
msgid "Header"
-msgstr ""
+msgstr "Encabezamiento"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
msgid "Here shows the files used by aria2."
-msgstr ""
+msgstr "Aquí se muestran los archivos utilizados por aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv4 habilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv6 habilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
msgid "IPv6 disabled"
-msgstr ""
+msgstr "IPv6 deshabilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
msgid ""
@@ -265,6 +273,10 @@ msgid ""
"Configuring this option with your preferred download speed can increase your "
"download speed in some cases."
msgstr ""
+"Si toda la velocidad de descarga de cada torrent es inferior a SPEED, aria2 "
+"aumenta temporalmente el número de pares para intentar obtener más velocidad "
+"de descarga. Configurar esta opción con su velocidad de descarga preferida "
+"puede aumentar su velocidad de descarga en algunos casos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
msgid "Info"
@@ -272,53 +284,55 @@ msgstr "Información"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
msgid "Installed web interface:"
-msgstr ""
+msgstr "Interfaz web instalada:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
msgid "Json-RPC URL"
-msgstr ""
+msgstr "URL de Json-RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
msgid "Keep in memory"
-msgstr ""
+msgstr "Guardar en la memoria"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
msgid "Last 50 lines of log file:"
-msgstr ""
+msgstr "Últimas 50 líneas del archivo de registro:"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
msgid "Last 50 lines of syslog:"
-msgstr ""
+msgstr "Últimas 50 líneas de syslog:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
msgid "Leave blank to use default user."
-msgstr ""
+msgstr "Déjelo en blanco para usar el usuario predeterminado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
msgid "List of additional BitTorrent tracker's announce URI."
-msgstr ""
+msgstr "Lista de URI de anuncio de trackers de BitTorrent adicionales."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
msgid ""
"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
"netrc</code>."
msgstr ""
+"Lista de configuraciones adicionales. Formato: opción=valor, p. Ej. "
+"<code>netrc-path=/tmp/.netrc</code>."
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
msgid "Loading"
-msgstr ""
+msgstr "Cargando"
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
msgid "Log"
-msgstr ""
+msgstr "Registro"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
msgid "Log Data"
-msgstr ""
+msgstr "Dato de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
msgid "Log file"
-msgstr ""
+msgstr "Archivo de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
msgid "Log level"
@@ -326,7 +340,7 @@ msgstr "Nivel de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
msgid "Lowest speed limit"
-msgstr ""
+msgstr "Límite de velocidad mínima"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
msgid "Max concurrent downloads"
@@ -338,7 +352,7 @@ msgstr "Máxima conexiones por servidor"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
msgid "Max download limit"
-msgstr ""
+msgstr "Límite máximo de descarga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
msgid "Max number of split"
@@ -346,27 +360,27 @@ msgstr "Número máximo de división"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
msgid "Max open files"
-msgstr ""
+msgstr "Máx. archivos abiertos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
msgid "Max overall download limit"
-msgstr ""
+msgstr "Límite máximo de descarga total"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
msgid "Max overall upload limit"
-msgstr ""
+msgstr "Límite total máximo de carga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
msgid "Max peers"
-msgstr ""
+msgstr "Máx. pares"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
msgid "Max tries"
-msgstr ""
+msgstr "Máx. de intentos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
msgid "Max upload limit"
-msgstr ""
+msgstr "Límite máximo de carga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
msgid "Min split size"
@@ -379,11 +393,11 @@ msgstr "Sin autenticacion"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
msgid "No log data."
-msgstr ""
+msgstr "No hay datos de registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
msgid "None"
-msgstr ""
+msgstr "Ninguno"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
msgid "Notice"
@@ -391,23 +405,24 @@ msgstr "Aviso"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
msgid "Pause"
-msgstr ""
+msgstr "Pausa"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
msgid "Pause download after added."
-msgstr ""
+msgstr "Pausa la descarga después de añadir."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
msgid "Pause downloads created as a result of metadata download."
msgstr ""
+"Pausa las descargas creadas como resultado de la descarga de metadatos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
msgid "Pause metadata"
-msgstr ""
+msgstr "Pausar metadatos"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
msgid "Please input token length:"
-msgstr ""
+msgstr "Ingrese la longitud del token:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
msgid "Prefix of peer ID"
@@ -415,19 +430,19 @@ msgstr "Prefijo de ID de par"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
msgid "Private key"
-msgstr ""
+msgstr "Clave privada"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
msgid "Proxy password"
-msgstr ""
+msgstr "Contraseña de proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
msgid "Proxy user"
-msgstr ""
+msgstr "Usuario de proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
msgid "RPC Options"
-msgstr ""
+msgstr "Opciones de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
msgid "RPC authentication method"
@@ -435,7 +450,7 @@ msgstr "Método de autenticación RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
msgid "RPC certificate"
-msgstr ""
+msgstr "Certificado de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
msgid "RPC password"
@@ -447,21 +462,24 @@ msgstr "Puerto RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
msgid "RPC private key"
-msgstr ""
+msgstr "Clave privada de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
msgid "RPC secure"
-msgstr ""
+msgstr "RPC seguro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
msgid "RPC token"
-msgstr ""
+msgstr "Token RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
msgid ""
"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
"scheme to access the server. For WebSocket client, use wss scheme."
msgstr ""
+"El transporte RPC será encriptado por SSL/TLS. Los clientes RPC deben usar "
+"el esquema https para acceder al servidor. Para el cliente WebSocket, use el "
+"esquema wss."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
msgid "RPC username"
@@ -469,11 +487,11 @@ msgstr "Nombre de usuario RPC"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
msgid "Refresh every 10 seconds."
-msgstr ""
+msgstr "Actualiza cada 10 segundos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
msgid "Remove unselected file"
-msgstr ""
+msgstr "Eliminar archivo no seleccionado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
msgid ""
@@ -481,14 +499,17 @@ msgid ""
"Please use this option with care because it will actually remove files from "
"your disk."
msgstr ""
+"Elimina los archivos no seleccionados cuando se completa la descarga en "
+"BitTorrent. Utilice esta opción con cuidado porque en realidad eliminará los "
+"archivos de su disco."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
msgid "Request peer speed limit"
-msgstr ""
+msgstr "Solicitar límite de velocidad del par"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
msgid "Retry wait"
-msgstr ""
+msgstr "Espera de reintento"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
msgid "Run daemon as user"
@@ -496,13 +517,15 @@ msgstr "Ejecutar demonio como usuario"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
msgid "Sava metadata"
-msgstr ""
+msgstr "Guardar metadatos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
msgid ""
"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
"is not saved during download."
msgstr ""
+"Guarde un archivo de control (*.aria2) cada N segundos. Si se da 0, no se "
+"guarda un archivo de control durante la descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
msgid ""
@@ -510,12 +533,18 @@ msgid ""
"This option also saves control file in that situations. This may be useful "
"to save BitTorrent seeding which is recognized as completed state."
msgstr ""
+"Guarde la descarga en el archivo de sesión incluso si la descarga se ha "
+"completado o eliminado. Esta opción también guarda el archivo de control en "
+"esas situaciones. Esto puede ser útil para guardar la siembra de BitTorrent "
+"que se reconoce como estado completado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
msgid ""
"Save error/unfinished downloads to session file every N seconds. If 0 is "
"given, file will be saved only when aria2 exits."
msgstr ""
+"Guarde el error/descargas inacabadas en el archivo de sesión cada N "
+"segundos. Si se da 0, el archivo se guardará solo cuando salga aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
msgid ""
@@ -523,26 +552,30 @@ msgid ""
"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
"suffix \".torrent\"."
msgstr ""
+"Guardar metadatos como archivo \".torrent\". Esta opción solo tiene efecto "
+"cuando se utiliza el URI de imán de BitTorrent. El nombre del archivo es "
+"hash de información codificado hexadecimal con sufijo \".torrent\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
msgid "Save session interval"
-msgstr ""
+msgstr "Guardar intervalo de sesión"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
msgid "Seed previously downloaded files without verifying piece hashes."
msgstr ""
+"Sembrar archivos descargados previamente sin verificar hashes de piezas."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
msgid "Seed ratio"
-msgstr ""
+msgstr "Proporción de semilla"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
msgid "Seed time"
-msgstr ""
+msgstr "Tiempo de semilla"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
msgid "Seed unverified"
-msgstr ""
+msgstr "Semilla sin verificar"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
msgid ""
@@ -550,6 +583,9 @@ msgid ""
"if remote server responds with <code>Content-Encoding: gzip</code> or "
"<code>Content-Encoding: deflate</code>."
msgstr ""
+"Enviar <code>Aceptar: deflate, gzip</code> encabezado de solicitud e inflar "
+"respuesta si el servidor remoto responde con <code>Content-Encoding: gzip</"
+"code> o <code Content-Encoding: deflate</code>."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
msgid ""
@@ -558,6 +594,10 @@ msgid ""
"you can add Cache-Control header with a directive you like using \"Header\" "
"option."
msgstr ""
+"Envíe el encabezado <code>Cache-Control: no-cache</code> y <code>Pragma: no-"
+"cache</code> para evitar el contenido en caché. Si está deshabilitado, estos "
+"encabezados no se envían y puede agregar el encabezado Cache-Control con una "
+"directiva que le guste usando la opción \"Encabezado\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
msgid ""
@@ -565,30 +605,44 @@ msgid ""
"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
"open for incoming TCP traffic."
msgstr ""
+"Establezca el número de puerto TCP para las descargas de BitTorrent. Formato "
+"de aceptación: \"6881,6885\", \"6881-6999\" y \"6881-6889,6999\". Asegúrese "
+"de que los puertos especificados estén abiertos para el tráfico TCP entrante."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
msgid ""
"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
"that the specified ports are open for incoming UDP traffic."
msgstr ""
+"Configure el puerto de escucha UDP utilizado por DHT (IPv4, IPv6) y el "
+"tracker UDP. Asegúrese de que los puertos especificados estén abiertos para "
+"el tráfico UDP entrante."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
msgid ""
"Set max download speed per each download in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de descarga por cada descarga en bytes/seg. 0 "
+"significa sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de descarga global en bytes/seg. 0 significa "
+"sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de carga general en bytes/seg. 0 significa "
+"sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
msgid ""
"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de carga por cada torrent en bytes/seg. 0 "
+"significa sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
msgid ""
@@ -596,30 +650,35 @@ msgid ""
"server. After the connection is established, this option makes no effect and "
"\"Timeout\" option is used instead."
msgstr ""
+"Establezca el tiempo de espera de conexión en segundos para establecer la "
+"conexión al servidor HTTP/FTP/proxy. Una vez establecida la conexión, esta "
+"opción no tiene efecto y en su lugar se utiliza la opción \"Tiempo de espera"
+"\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
msgid "Set the seconds to wait between retries."
-msgstr ""
+msgstr "Establezca los segundos para esperar entre reintentos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
msgid "Set user agent for HTTP(S) downloads."
-msgstr ""
+msgstr "Establecer agente de usuario para descargas HTTP(S)."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
msgid "Settings"
-msgstr ""
+msgstr "Configuraciones"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
msgid "Settings in this section will be added to config file."
msgstr ""
+"La configuración de esta sección se agregará al archivo de configuración."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
msgid "Settings list"
-msgstr ""
+msgstr "Lista de configuraciones"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
msgid "Show URL"
-msgstr ""
+msgstr "Mostrar URL"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
msgid ""
@@ -631,12 +690,22 @@ msgid ""
"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
"entirely until allocation finishes."
msgstr ""
+"Especifique el método de asignación de archivos. Si está utilizando sistemas "
+"de archivos más nuevos como ext4 (con soporte de extensión), btrfs, xfs o "
+"NTFS (solo compilación MinGW), \"falloc\" es su mejor opción. Asigna "
+"archivos grandes (pocos GiB) casi instantáneamente, pero puede no estar "
+"disponible si su sistema no tiene la función posix_fallocate(3). No use "
+"\"falloc\" con sistemas de archivos heredados como ext3 y FAT32 porque toma "
+"casi el mismo tiempo que \"prealloc\" y bloquea completamente aria2 hasta "
+"que finaliza la asignación."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
msgid ""
"Specify maximum number of files to open in multi-file BitTorrent download "
"globally."
msgstr ""
+"Especifique el número máximo de archivos para abrir en la descarga de "
+"BitTorrent de varios archivos a nivel mundial."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
msgid ""
@@ -644,6 +713,10 @@ msgid ""
"with this option, seeding ends when at least one of the conditions is "
"satisfied. Specifying 0 disables seeding after download completed."
msgstr ""
+"Especifique el tiempo de siembra en minutos. Si se especifica la opción "
+"\"Proporción de semillas\" junto con esta opción, la siembra finaliza cuando "
+"se cumple al menos una de las condiciones. Especificar 0 deshabilita la "
+"siembra después de completar la descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
msgid ""
@@ -651,10 +724,16 @@ msgid ""
"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
"Specify 0.0 if you intend to do seeding regardless of share ratio."
msgstr ""
+"Especificar proporción de participación. La semilla ha completado torrents "
+"hasta que la proporción de participación alcance la PROPORCIÓN. Le "
+"recomendamos encarecidamente que especifique iguales o más de 1.0 aquí. "
+"Especifique 0.0 si tiene la intención de sembrar, independientemente de la "
+"proporción de acciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
msgstr ""
+"Especifique el número máximo de pares por torrent, 0 significa ilimitado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
msgid ""
@@ -663,16 +742,22 @@ msgid ""
"than 20 bytes are specified, random byte data are added to make its length "
"20 bytes."
msgstr ""
+"Especifique el prefijo de la ID del par. La ID del par en BitTorrent tiene "
+"20 bytes de longitud. Si se especifican más de 20 bytes, solo se utilizan "
+"los primeros 20 bytes. Si se especifican menos de 20 bytes, se agregan datos "
+"de bytes aleatorios para que su longitud sea de 20 bytes."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
msgid ""
"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
"0 is given, this feature is disabled."
msgstr ""
+"Detenga la descarga de BitTorrent si la velocidad de descarga es 0 en N "
+"segundos consecutivos. Si se da 0, esta característica está deshabilitada."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
msgid "Stop timeout"
-msgstr ""
+msgstr "Detener tiempo de espera"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
msgid "The Aria2 service is not running."
@@ -685,18 +770,22 @@ msgstr "El servicio Aria2 se está ejecutando."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
msgid "The directory to store the config file, session file and DHT file."
msgstr ""
+"El directorio para almacenar el archivo de configuración, el archivo de "
+"sesión y el archivo DHT."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
msgstr ""
+"El directorio para almacenar el archivo descargado. p.ej. <code>/mnt/sda1</"
+"code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
msgid "The file name of the log file."
-msgstr ""
+msgstr "El nombre del archivo de registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
msgid "The maximum number of connections to one server for each download."
-msgstr ""
+msgstr "El número máximo de conexiones a un servidor para cada descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
@@ -704,10 +793,11 @@ msgstr ""
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
msgid "This option will be ignored if a private flag is set in a torrent."
msgstr ""
+"Esta opción se ignorará si se establece un indicador privado en un torrent."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
msgid "Timeout"
-msgstr ""
+msgstr "Tiempo de espera"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
msgid "Token"
@@ -715,7 +805,7 @@ msgstr "Token"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
msgid "True"
-msgstr ""
+msgstr "Verdadero"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
msgid "Use WebSocket"
@@ -723,13 +813,16 @@ msgstr "Utilizar websocket"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
msgid "Use a proxy server for all protocols."
-msgstr ""
+msgstr "Use un servidor proxy para todos los protocolos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
msgid ""
"Use the certificate authorities in FILE to verify the peers. The certificate "
"file must be in PEM format and can contain multiple CA certificates."
msgstr ""
+"Use las autoridades de certificación en ARCHIVO para verificar los pares. El "
+"archivo del certificado debe estar en formato .PEM y puede contener "
+"múltiples certificados de CA."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
msgid ""
@@ -739,6 +832,12 @@ msgid ""
"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
"you have to specify the \"RPC private key\" as well."
msgstr ""
+"Utilice el certificado en ARCHIVO para el servidor RPC. El certificado debe "
+"estar en PKCS12 (.p12, .pfx) o en formato .PEM. <br/>Los archivos PKCS12 "
+"deben contener el certificado, una clave y, opcionalmente, una cadena de "
+"certificados adicionales. ¡Solo se pueden abrir archivos PKCS12 con una "
+"contraseña de importación en blanco!<br/>Al usar PEM, también debe "
+"especificar la \"clave privada RPC\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
msgid ""
@@ -748,22 +847,32 @@ msgid ""
"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
"you have to specify the \"Private key\" as well."
msgstr ""
+"Use el certificado del cliente en ARCHIVO. El certificado debe estar en "
+"PKCS12 (.p12, .pfx) o en formato PEM.<br/>Los archivos PKCS12 deben contener "
+"el certificado, una clave y, opcionalmente, una cadena de certificados "
+"adicionales. ¡Solo se pueden abrir archivos PKCS12 con una contraseña de "
+"importación en blanco!<br/>Al usar PEM, también debe especificar la \"Clave "
+"privada\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
msgid ""
"Use the private key in FILE for RPC server. The private key must be "
"decrypted and in PEM format."
msgstr ""
+"Use la clave privada en ARCHIVO para el servidor RPC. La clave privada debe "
+"ser descifrada y en formato .PEM."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
msgid ""
"Use the private key in FILE. The private key must be decrypted and in PEM "
"format. The behavior when encrypted one is given is undefined."
msgstr ""
+"Use la clave privada en ARCHIVO. La clave privada debe ser descifrada y en "
+"formato .PEM. El comportamiento cuando se da cifrado uno no está definido."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
msgid "User agent"
-msgstr ""
+msgstr "Agente de usuario"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
msgid "Username & Password"
@@ -773,6 +882,8 @@ msgstr "Nombre de usuario y contraseña"
msgid ""
"Verify the peer using certificates specified in \"CA certificate\" option."
msgstr ""
+"Verifique el par utilizando los certificados especificados en la opción "
+"\"Certificado CA\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
msgid "Warn"
@@ -786,19 +897,19 @@ msgstr "Advertir"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
msgid "You can append K or M."
-msgstr ""
+msgstr "Puedes agregar K o M."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
msgid "falloc"
-msgstr ""
+msgstr "falloc"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
msgid "prealloc"
-msgstr ""
+msgstr "prealloc"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
msgid "trunc"
-msgstr ""
+msgstr "trunc"
#~ msgid "\"Falloc\" is not available in all cases."
#~ msgstr "\"Falloc\" no está disponible en todos los casos."
diff --git a/applications/luci-app-banip/luasrc/controller/banip.lua b/applications/luci-app-banip/luasrc/controller/banip.lua
index 42328d7ea..6ada1d516 100644
--- a/applications/luci-app-banip/luasrc/controller/banip.lua
+++ b/applications/luci-app-banip/luasrc/controller/banip.lua
@@ -30,7 +30,9 @@ function index()
end
function ban_action(name)
- if name == "do_reload" then
+ if name == "do_refresh" then
+ luci.sys.call("/etc/init.d/banip refresh >/dev/null 2>&1")
+ elseif name == "do_reload" then
luci.sys.call("/etc/init.d/banip reload >/dev/null 2>&1")
end
luci.http.prepare_content("text/plain")
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
index 57294e5c4..9ce6703a4 100644
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
+++ b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
@@ -45,8 +45,6 @@ o4:value("uclient-fetch")
o4:value("wget")
o4:value("curl")
o4:value("aria2c")
-o4:value("wget-nossl", "wget-nossl (noSSL)")
-o4:value("busybox", "wget-busybox (noSSL)")
o4.default = "uclient-fetch"
o4.rmempty = false
@@ -57,22 +55,9 @@ ds.template = "banip/runtime"
-- Source Table
-bl = m:section(TypedSection, "source", translate("IP Blocklist Sources"))
+bl = m:section(TypedSection, "source", translate("IPSet Sources"))
bl.template = "banip/sourcelist"
-ssl = bl:option(DummyValue, "ban_src", translate("SSL req."))
-function ssl.cfgvalue(self, section)
- local source = self.map:get(section, "ban_src") or self.map:get(section, "ban_src_6")
- if source then
- if source:match("https://") then
- return translate("Yes")
- else
- return translate("No")
- end
- end
- return translate("n/a")
-end
-
name_4 = bl:option(Flag, "ban_src_on", translate("enable IPv4"))
name_4.rmempty = false
@@ -108,28 +93,35 @@ e2.disabled = "0"
e2.enabled = "10"
e2.rmempty = false
-e3 = e:option(Flag, "ban_backup", translate("Enable Blocklist Backup"),
- translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in 'backup mode'."))
-e3.rmempty = false
-
-e4 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
- translate("Target directory for banIP backups. Please use preferably a non-volatile disk, e.g. an external usb stick."))
-e4:depends("ban_backup", 1)
-e4.datatype = "directory"
-e4.default = "/mnt"
-e4.rmempty = true
-
-e5 = e:option(Flag, "ban_backupboot", translate("Backup Mode"),
- translate("Do not automatically update blocklists during startup, use their backups instead."))
-e5:depends("ban_backup", 1)
-e5.rmempty = true
+e3 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
+ translate("Target directory for banIP backups. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e3.datatype = "directory"
+e3.default = "/tmp"
+e3.rmempty = true
-e6 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
+e4 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
translate("Size of the download queue to handle downloads &amp; IPset processing in parallel (default '4'). ")
.. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e6.default = 4
-e6.datatype = "range(1,32)"
-e6.rmempty = false
+e4.default = 4
+e4.datatype = "range(1,32)"
+e4.rmempty = false
+
+e5 = e:option(ListValue, "ban_sshdaemon", translate("SSH Daemon"),
+ translate("Select the SSH daemon for logfile parsing, to detect break-in events."))
+e5:value("dropbear")
+e5:value("sshd")
+e5.default = "dropbear"
+e5.rmempty = true
+
+e6 = e:option(Flag, "ban_autoblacklist", translate("Local Save Blacklist Addons"),
+ translate("Blacklist auto addons are stored temporary in the IPSet and saved permanently in the local blacklist. Disable this option to prevent the local save."))
+e6.default = e6.enabled
+e6.rmempty = true
+
+e7 = e:option(Flag, "ban_autowhitelist", translate("Local Save Whitelist Addons"),
+ translate("Whitelist auto addons are stored temporary in the IPSet and saved permanently in the local whitelist. Disable this option to prevent the local save."))
+e7.default = e7.enabled
+e7.rmempty = true
-- Optional Extra Options
@@ -139,72 +131,79 @@ e20.default = 2
e20.datatype = "range(1,60)"
e20.optional = true
-e21 = e:option(Value, "ban_fetchparm", translate("Download Options"),
- translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
+e21 = e:option(ListValue, "ban_starttype", translate("Start Type"),
+ translate("Select the used start type during boot."))
+e21:value("start")
+e21:value("reload")
+e21.default = "start"
e21.optional = true
-e22 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
-e22.default = "input_wan_rule"
-e22.datatype = "uciname"
+e22 = e:option(Value, "ban_fetchparm", translate("Download Options"),
+ translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
e22.optional = true
-e23 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
-e23.default = "forwarding_wan_rule"
-e23.datatype = "uciname"
-e23.optional = true
-
-e24 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
-e24.default = "input_lan_rule"
-e24.datatype = "uciname"
-e24.optional = true
-
-e25 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
-e25.default = "forwarding_lan_rule"
-e25.datatype = "uciname"
-e25.optional = true
-
-e26 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
-e26:value("REJECT")
-e26:value("DROP")
-e26.default = "DROP"
-e26.optional = true
-
-e27 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
-e27:value("REJECT")
-e27:value("DROP")
-e27.default = "REJECT"
-e27.optional = true
-
-e28 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
-e28.default = "input_wan_rule"
-e28.datatype = "uciname"
-e28.optional = true
-
-e29 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
-e29.default = "forwarding_wan_rule"
-e29.datatype = "uciname"
-e29.optional = true
-
-e30 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
-e30.default = "input_lan_rule"
+e30 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
+e30.default = "input_wan_rule"
e30.datatype = "uciname"
e30.optional = true
-e31 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
-e31.default = "forwarding_lan_rule"
+e31 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
+e31.default = "forwarding_wan_rule"
e31.datatype = "uciname"
e31.optional = true
-e32 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
-e32:value("REJECT")
-e32:value("DROP")
-e32.default = "DROP"
+e32 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
+e32.default = "input_lan_rule"
+e32.datatype = "uciname"
e32.optional = true
-e33 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
-e33:value("REJECT")
-e33:value("DROP")
-e33.default = "REJECT"
+e33 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
+e33.default = "forwarding_lan_rule"
+e33.datatype = "uciname"
e33.optional = true
+e34 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
+e34:value("REJECT")
+e34:value("DROP")
+e34.default = "DROP"
+e34.optional = true
+
+e35 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
+e35:value("REJECT")
+e35:value("DROP")
+e35.default = "REJECT"
+e35.optional = true
+
+e36 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
+e36.default = "input_wan_rule"
+e36.datatype = "uciname"
+e36.optional = true
+
+e37 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
+e37.default = "forwarding_wan_rule"
+e37.datatype = "uciname"
+e37.optional = true
+
+e38 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
+e38.default = "input_lan_rule"
+e38.datatype = "uciname"
+e38.optional = true
+
+e39 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
+e39.default = "forwarding_lan_rule"
+e39.datatype = "uciname"
+e39.optional = true
+
+e40 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
+e40:value("REJECT")
+e40:value("DROP")
+e40.default = "DROP"
+e40.optional = true
+
+e41 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
+e41:value("REJECT")
+e41:value("DROP")
+e41.default = "REJECT"
+e41.optional = true
+
return m
diff --git a/applications/luci-app-banip/luasrc/view/banip/runtime.htm b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
index 410528130..44682206b 100644
--- a/applications/luci-app-banip/luasrc/view/banip/runtime.htm
+++ b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
@@ -10,16 +10,23 @@ This is free software, licensed under the Apache License, Version 2.0
{
var btn1 = document.getElementById("btn1");
var btn1_running = document.getElementById("btn1_running");
+ var btn2 = document.getElementById("btn2");
+ var btn2_running = document.getElementById("btn2_running");
var view = document.getElementById("value_1");
var input = json.data.status;
- btn1.value = "<%:Reload%>";
- btn1.name = "do_reload";
+ btn1.value = "<%:Refresh%>";
+ btn1.name = "do_refresh";
+
+ btn2.value = "<%:Reload%>";
+ btn2.name = "do_reload";
view.innerHTML = input || "-";
if (input != "running")
{
btn1.disabled = false;
running(btn1_running, 0);
+ btn2.disabled = false;
+ running(btn2_running, 0);
}
view = document.getElementById("value_2");
input = json.data.version;
@@ -31,6 +38,9 @@ This is free software, licensed under the Apache License, Version 2.0
input = json.data.ipset_info;
view.innerHTML = input || "-";
view = document.getElementById("value_5");
+ input = json.data.backup_dir;
+ view.innerHTML = input || "-";
+ view = document.getElementById("value_6");
input = json.data.last_run;
view.innerHTML = input || "-";
}
@@ -39,10 +49,21 @@ function btn_action(action)
{
var btn1 = document.getElementById("btn1");
var btn1_running = document.getElementById("btn1_running");
+ var btn2 = document.getElementById("btn2");
+ var btn2_running = document.getElementById("btn2_running");
- btn1.disabled = true;
- running(btn1_running, 1);
-
+ if (action.name === "do_refresh")
+ {
+ btn1.disabled = true;
+ btn2.disabled = true;
+ running(btn1_running, 1);
+ }
+ else if (action.name === "do_reload")
+ {
+ btn1.disabled = true;
+ btn2.disabled = true;
+ running(btn2_running, 1);
+ }
new XHR.get('<%=luci.dispatcher.build_url("admin", "services", "banip")%>/action/' + action.name, null,
function(x)
{
@@ -114,17 +135,30 @@ function btn_action(action)
</div>
</div>
<div class="cbi-value" id="status_5">
- <label class="cbi-value-title" for="status_5"><%:Last Run%></label>
+ <label class="cbi-value-title" for="status_5"><%:Backup Directory%></label>
<div class="cbi-value-field">
<span class="runtime" id="value_5">-</span>
</div>
</div>
+<div class="cbi-value" id="status_6">
+ <label class="cbi-value-title" for="status_6"><%:Last Run%></label>
+ <div class="cbi-value-field">
+ <span class="runtime" id="value_6">-</span>
+ </div>
+</div>
<hr />
<div class="cbi-value" id="button_1">
- <label class="cbi-value-title" for="button_1"><%:Reload IPSets%></label>
+ <label class="cbi-value-title" for="button_1"><%:Refresh IPSets%></label>
<div class="cbi-value-field">
- <input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
+ <input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_refresh" value="<%:Refresh%>" onclick="btn_action(this)" />
<span id="btn1_running" class="btn_running"></span>
</div>
</div>
+<div class="cbi-value" id="button_2">
+ <label class="cbi-value-title" for="button_2"><%:Reload IPSet Sources%></label>
+ <div class="cbi-value-field">
+ <input class="cbi-button cbi-button-reset" id="btn2" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
+ <span id="btn2_running" class="btn_running"></span>
+ </div>
+</div>
diff --git a/applications/luci-app-banip/po/es/banip.po b/applications/luci-app-banip/po/es/banip.po
index 2edcd63d3..b8395a76a 100644
--- a/applications/luci-app-banip/po/es/banip.po
+++ b/applications/luci-app-banip/po/es/banip.po
@@ -2,12 +2,12 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-07-25 19:35-0300\n"
+"POT-Creation-Date: 2019-07-23 22:17-0300\n"
+"PO-Revision-Date: 2019-09-17 22:33-0300\n"
"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: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -20,11 +20,11 @@ msgstr "Resumen de ASN"
msgid "ASN Prefixes"
msgstr "Prefijos ASN"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
msgid "ASN/Country"
msgstr "ASN/País"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:137
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
msgid "Additional trigger delay in seconds before banIP processing begins."
msgstr ""
"Demora adicional del disparador en segundos antes de que comience el "
@@ -38,13 +38,20 @@ msgstr "Avanzado"
msgid "Automatic WAN Interface Detection"
msgstr "Detección automática de la interfaz WAN"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
msgid "Backup Directory"
msgstr "Directorio de copia de seguridad"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
+msgid ""
+"Blacklist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local blacklist. Disable this option to prevent the local "
+"save."
+msgstr ""
+"Los complementos automáticos de la lista negra se almacenan temporalmente en "
+"el IPSet y se guardan permanentemente en la lista negra local. Deshabilite "
+"esta opción para evitar el guardado local."
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:45
msgid "Check the current available IPSets."
@@ -61,28 +68,19 @@ msgstr ""
msgid "Country Resources"
msgstr "Recursos del país"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-"Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en el \"modo de copia de "
-"seguridad\"."
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
msgid "DNS Chain"
msgstr "Cadena de DNS"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:172
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
msgid "DST Target IPv4"
msgstr "Objetivo DST IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:204
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
msgid "DST Target IPv6"
msgstr "Objetivo DST IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
msgid "Description"
msgstr "Descripción"
@@ -94,15 +92,7 @@ msgstr ""
"Deshabilitar la detección automática de WAN y seleccione sus interfaces "
"preferidas manualmente."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"sus copias de seguridad en su lugar."
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
msgid "Download Options"
msgstr "Opciones de descarga"
@@ -110,7 +100,7 @@ msgstr "Opciones de descarga"
msgid "Download Utility"
msgstr "Utilidad de descarga"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
msgid "Download Utility (SSL Library)"
msgstr "Utilidad de descarga (Librería SSL)"
@@ -126,15 +116,11 @@ msgstr "Editar configuración"
msgid "Edit Whitelist"
msgstr "Editar lista blanca"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista de bloqueo"
-
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
msgid "Enable banIP"
msgstr "Habilitar banIP"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilite el registro de depuración detallado en caso de cualquier error de "
@@ -144,7 +130,7 @@ msgstr ""
msgid "Enter IP/CIDR/ASN/ISO"
msgstr "Ingrese IP/CIDR/ASN/ISO"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
msgid "Extra Options"
msgstr "Opciones extra"
@@ -156,7 +142,7 @@ msgstr ""
"Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
"documentación en línea</a>"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -172,18 +158,18 @@ msgstr "Geolocalización"
msgid "IANA Information"
msgstr "Información IANA"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr "Fuentes de lista de bloqueo de IP"
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
msgid "IP/ASN Mapping"
msgstr "Asignación de IP/ASN"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
msgid "IPSet Information"
msgstr "Información de IPSet"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr "Fuentes de IPSet"
+
#: applications/luci-app-banip/luasrc/controller/banip.lua:18
msgid "IPSet-Lookup"
msgstr "Búsqueda de IPSet"
@@ -199,23 +185,23 @@ msgstr ""
msgid "Interface Selection"
msgstr "Selección de interfaz"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
msgid "LAN Forward Chain IPv4"
msgstr "Cadena de reenvío LAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
msgid "LAN Forward Chain IPv6"
msgstr "Cadena de reenvío LAN IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
msgid "LAN Input Chain IPv4"
msgstr "Cadena de entrada LAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
msgid "LAN Input Chain IPv6"
msgstr "Cadena de entrada LAN IPv6"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
msgid "Last Run"
msgstr "Último arranque"
@@ -229,7 +215,7 @@ msgstr ""
msgid "Load"
msgstr "Cargar"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
msgid "Loading"
msgstr "Cargando"
@@ -238,24 +224,28 @@ msgstr "Cargando"
msgid "Loading ..."
msgstr "CArgando..."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+msgid "Local Save Blacklist Addons"
+msgstr "Complementos locales para guardar la lista negra"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
+msgid "Local Save Whitelist Addons"
+msgstr "Complementos locales para guardar la lista blanca"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
msgid "Low Priority Service"
msgstr "Servicio de baja prioridad"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
msgid "Max. Download Queue"
msgstr "Máx. cola de descarga"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
-msgstr "No"
-
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
msgid "No response!"
msgstr "¡Ninguna respuesta!"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -285,34 +275,43 @@ msgstr "Edite este archivo directamente en una sesión de terminal."
msgid "RIPE-Lookup"
msgstr "Buscar RIPE"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr "Actualizar IPSets"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
msgid "Reload"
msgstr "Recargar"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
-msgstr "Recargar IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
+msgstr "Recargar las fuentes de IPSet"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
msgid "Runtime Information"
msgstr "Información de tiempo de ejecución"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
msgid "SRC Target IPv4"
msgstr "Objetivo SRC IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
msgid "SRC Target IPv6"
msgstr "Objetivo SRC IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
msgid "SRC/DST"
msgstr "SRC/DST"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
-msgstr "SSL requerido."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
+msgstr "Demonio SSH"
#: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
#: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:26
@@ -320,7 +319,17 @@ msgstr "SSL requerido."
msgid "Save"
msgstr "Guardar"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+"Seleccione el demonio SSH para el análisis del archivo de registro, para "
+"detectar eventos de intrusión."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr "Seleccione el tipo de inicio utilizado durante el arranque."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
msgid ""
"Set the nice level to 'low priority' and banIP background processing will "
"take less resources from the system."
@@ -332,7 +341,7 @@ msgstr ""
msgid "Show only set member with packet counter &gt; 0"
msgstr "Mostrar solo el miembro establecido con el contador de paquetes &gt; 0"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
msgid ""
"Size of the download queue to handle downloads &amp; IPset processing in "
"parallel (default '4')."
@@ -340,7 +349,7 @@ msgstr ""
"Tamaño de la cola de descarga para manejar descargas &amp; Procesamiento de "
"IPset en paralelo (predeterminado es '4')."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:143
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
msgid ""
"Special options for the selected download utility, e.g. '--timeout=20 --no-"
"check-certificate -O'."
@@ -348,13 +357,18 @@ msgstr ""
"Opciones especiales para la utilidad de descarga seleccionada, por ejemplo, "
"'--timeout=20 --no-check-certificate -O'."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr "Tipo de inicio"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
msgstr ""
-"Directorio de destino para las copias de seguridad de banIP. Utilice "
-"preferiblemente un disco no volátil, por ej. una memoria usb externa."
+"Directorio de destino para copias de seguridad de banIP. El valor "
+"predeterminado es '/tmp', utilice preferiblemente un disco no volátil si "
+"está disponible."
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
msgid ""
@@ -379,7 +393,7 @@ msgid "The syslog output, pre-filtered for banIP related messages only."
msgstr ""
"La salida de syslog, prefiltrada solo para mensajes relacionados con banIP."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
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 "
@@ -469,11 +483,11 @@ msgstr ""
"Este formulario le permite modificar el contenido del archivo de "
"configuración de banIP principal (/etc/config/banip)."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:136
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
msgid "Trigger Delay"
msgstr "Retardo de disparo"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
msgid "Verbose Debug Logging"
msgstr "Registro de depuración detallado"
@@ -481,51 +495,99 @@ msgstr "Registro de depuración detallado"
msgid "View Logfile"
msgstr "Ver archivo de registro"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:151
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
msgid "WAN Forward Chain IPv4"
msgstr "Cadena de reenvío WAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:183
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
msgid "WAN Forward Chain IPv6"
msgstr "Cadena de reenvío WAN IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
msgid "WAN Input Chain IPv4"
msgstr "Cadena de entrada WAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:178
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
msgid "WAN Input Chain IPv6"
msgstr "Cadena de entrada WAN IPv6"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
+msgid ""
+"Whitelist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local whitelist. Disable this option to prevent the local "
+"save."
+msgstr ""
+"Los complementos automáticos de la lista blanca se almacenan temporalmente "
+"en el IPSet y se guardan permanentemente en la lista blanca local. "
+"Deshabilite esta opción para evitar el guardado local."
+
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
msgid "Whois Information"
msgstr "Información Whois"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
-msgstr "Sí"
-
#: applications/luci-app-banip/luasrc/controller/banip.lua:16
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
msgid "banIP"
msgstr "banIP"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
msgid "banIP Status"
msgstr "Estado de banIP"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
msgid "banIP Version"
msgstr "Versión de banIP"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
msgid "enable IPv4"
msgstr "habilitar IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
msgid "enable IPv6"
msgstr "habilitar IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr "n/d"
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in 'backup mode'."
+#~ msgstr ""
+#~ "Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en el \"modo de copia "
+#~ "de seguridad\"."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use their backups "
+#~ "instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "sus copias de seguridad en su lugar."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista de bloqueo"
+
+#~ msgid "IP Blocklist Sources"
+#~ msgstr "Fuentes de lista de bloqueo de IP"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Reload IPSets"
+#~ msgstr "Recargar IPSets"
+
+#~ msgid "SSL req."
+#~ msgstr "SSL requerido."
+
+#~ msgid ""
+#~ "Target directory for banIP backups. Please use preferably a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de banIP. Utilice "
+#~ "preferiblemente un disco no volátil, por ej. una memoria usb externa."
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
diff --git a/applications/luci-app-banip/po/templates/banip.pot b/applications/luci-app-banip/po/templates/banip.pot
index 1332bc9c3..b477622ee 100644
--- a/applications/luci-app-banip/po/templates/banip.pot
+++ b/applications/luci-app-banip/po/templates/banip.pot
@@ -9,11 +9,11 @@ msgstr ""
msgid "ASN Prefixes"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
msgid "ASN/Country"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:137
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
msgid "Additional trigger delay in seconds before banIP processing begins."
msgstr ""
@@ -25,12 +25,16 @@ msgstr ""
msgid "Automatic WAN Interface Detection"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
+msgid ""
+"Blacklist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local blacklist. Disable this option to prevent the local "
+"save."
msgstr ""
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:45
@@ -46,25 +50,19 @@ msgstr ""
msgid "Country Resources"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
msgid "DNS Chain"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:172
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
msgid "DST Target IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:204
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
msgid "DST Target IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
msgid "Description"
msgstr ""
@@ -74,13 +72,7 @@ msgid ""
"manually."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
msgid "Download Options"
msgstr ""
@@ -88,7 +80,7 @@ msgstr ""
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
msgid "Download Utility (SSL Library)"
msgstr ""
@@ -104,15 +96,11 @@ msgstr ""
msgid "Edit Whitelist"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
msgid "Enable banIP"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -120,7 +108,7 @@ msgstr ""
msgid "Enter IP/CIDR/ASN/ISO"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
msgid "Extra Options"
msgstr ""
@@ -130,7 +118,7 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -144,18 +132,18 @@ msgstr ""
msgid "IANA Information"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
msgid "IP/ASN Mapping"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
msgid "IPSet Information"
msgstr ""
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr ""
+
#: applications/luci-app-banip/luasrc/controller/banip.lua:18
msgid "IPSet-Lookup"
msgstr ""
@@ -170,23 +158,23 @@ msgstr ""
msgid "Interface Selection"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
msgid "LAN Forward Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
msgid "LAN Forward Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
msgid "LAN Input Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
msgid "LAN Input Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
msgid "Last Run"
msgstr ""
@@ -199,7 +187,7 @@ msgstr ""
msgid "Load"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
msgid "Loading"
msgstr ""
@@ -208,16 +196,20 @@ msgstr ""
msgid "Loading ..."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
-msgid "Low Priority Service"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+msgid "Local Save Blacklist Addons"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
-msgid "Max. Download Queue"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
+msgid "Local Save Whitelist Addons"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
+msgid "Max. Download Queue"
msgstr ""
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
@@ -225,7 +217,7 @@ msgstr ""
msgid "No response!"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -251,33 +243,42 @@ msgstr ""
msgid "RIPE-Lookup"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
msgid "Reload"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
msgid "SRC Target IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
msgid "SRC Target IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
msgid "SRC/DST"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
msgstr ""
#: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
@@ -286,7 +287,15 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
msgid ""
"Set the nice level to 'low priority' and banIP background processing will "
"take less resources from the system."
@@ -296,22 +305,26 @@ msgstr ""
msgid "Show only set member with packet counter &gt; 0"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
msgid ""
"Size of the download queue to handle downloads &amp; IPset processing in "
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:143
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
msgid ""
"Special options for the selected download utility, e.g. '--timeout=20 --no-"
"check-certificate -O'."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
msgstr ""
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
@@ -331,7 +344,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for banIP related messages only."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -395,11 +408,11 @@ msgid ""
"file (/etc/config/banip)."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:136
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
msgid "Verbose Debug Logging"
msgstr ""
@@ -407,28 +420,31 @@ msgstr ""
msgid "View Logfile"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:151
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
msgid "WAN Forward Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:183
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
msgid "WAN Forward Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
msgid "WAN Input Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:178
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
msgid "WAN Input Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
-msgid "Whois Information"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
+msgid ""
+"Whitelist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local whitelist. Disable this option to prevent the local "
+"save."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
+#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
+msgid "Whois Information"
msgstr ""
#: applications/luci-app-banip/luasrc/controller/banip.lua:16
@@ -436,22 +452,18 @@ msgstr ""
msgid "banIP"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
msgid "banIP Status"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
msgid "banIP Version"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
msgid "enable IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
msgid "enable IPv6"
msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr ""
diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po
index 9e649c2dd..092319bb1 100644
--- a/applications/luci-app-ddns/po/es/ddns.po
+++ b/applications/luci-app-ddns/po/es/ddns.po
@@ -2,15 +2,15 @@ msgid ""
msgstr ""
"Project-Id-Version: luci-app-ddns 2.4.0-1\n"
"POT-Creation-Date: 2016-01-30 11:07+0100\n"
-"PO-Revision-Date: 2019-05-15 20:11-0300\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"PO-Revision-Date: 2019-09-17 22:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language-Team: \n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
#: applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm:145
msgid "&"
@@ -28,7 +28,7 @@ msgstr "-- Predeterminado --"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:53
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:264
msgid "Advanced Settings"
-msgstr "Ajustes avanzados"
+msgstr "Configuración avanzada"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:46
msgid "Allow non-public IP's"
@@ -42,7 +42,7 @@ msgstr "Aplicando cambios"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:50
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:263
msgid "Basic Settings"
-msgstr "Ajustes básicos"
+msgstr "Configuración básica"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua:25
msgid ""
@@ -376,7 +376,7 @@ msgstr "GNU Wget usará la IP de la red dada, cURL usará la interfaz física."
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:26
msgid "Global Settings"
-msgstr "Ajustes globales"
+msgstr "Configuración global"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:606
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:615
@@ -802,7 +802,7 @@ msgstr "No hay servicio configurado."
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:56
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:265
msgid "Timer Settings"
-msgstr "Ajustes del temporizador"
+msgstr "Configuración del temporizador"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua:101
msgid "To change global settings click here"
diff --git a/applications/luci-app-dump1090/po/es/dump1090.po b/applications/luci-app-dump1090/po/es/dump1090.po
index 18c16bb8b..05782c6ec 100644
--- a/applications/luci-app-dump1090/po/es/dump1090.po
+++ b/applications/luci-app-dump1090/po/es/dump1090.po
@@ -206,8 +206,7 @@ msgstr "Puerto de escucha de salida TCP sin formato"
#: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:97
msgid "TCP raw output memory flush rate in seconds"
-msgstr ""
-"Velocidad de descarga de memoria de salida sin formato TCP en segundos"
+msgstr "Velocidad de descarga de memoria de salida sin formato TCP en segundos"
#: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:93
msgid "TCP raw output minimum size"
@@ -224,8 +223,7 @@ msgstr "Use el demodulador de 2.4MHz"
#: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:44
msgid "When reading from a file play back in realtime, not at max speed"
msgstr ""
-"Al leer desde un archivo, reproducir en tiempo real, no a la velocidad "
-"máxima"
+"Al leer desde un archivo, reproducir en tiempo real, no a la velocidad máxima"
#: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:180
msgid "Write json output every t seconds"
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
index 63af69f8a..80938711e 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
@@ -75,7 +75,8 @@ function forward_via_txt(s) {
return L.view.extend({
callHostHints: rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
}),
load: function() {
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index 4252cf369..6df3bc7f8 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -112,7 +112,8 @@ function rule_target_txt(s) {
return L.view.extend({
callHostHints: rpc.declare({
object: 'luci',
- method: 'host_hints'
+ method: 'getHostHints',
+ expect: { '': {} }
}),
load: function() {
@@ -221,42 +222,44 @@ return L.view.extend({
o.cast = 'table';
o.placeholder = _('any');
o.value('', 'any');
- o.value('echo-reply');
+ o.value('address-mask-reply');
+ o.value('address-mask-request');
+ o.value('communication-prohibited');
o.value('destination-unreachable');
- o.value('network-unreachable');
- o.value('host-unreachable');
- o.value('protocol-unreachable');
- o.value('port-unreachable');
+ o.value('echo-reply');
+ o.value('echo-request');
o.value('fragmentation-needed');
- o.value('source-route-failed');
- o.value('network-unknown');
+ o.value('host-precedence-violation');
+ o.value('host-prohibited');
+ o.value('host-redirect');
o.value('host-unknown');
+ o.value('host-unreachable');
+ o.value('ip-header-bad');
+ o.value('neighbour-advertisement');
+ o.value('neighbour-solicitation');
o.value('network-prohibited');
- o.value('host-prohibited');
- o.value('TOS-network-unreachable');
- o.value('TOS-host-unreachable');
- o.value('communication-prohibited');
- o.value('host-precedence-violation');
+ o.value('network-redirect');
+ o.value('network-unknown');
+ o.value('network-unreachable');
+ o.value('parameter-problem');
+ o.value('port-unreachable');
o.value('precedence-cutoff');
- o.value('source-quench');
+ o.value('protocol-unreachable');
o.value('redirect');
- o.value('network-redirect');
- o.value('host-redirect');
- o.value('TOS-network-redirect');
- o.value('TOS-host-redirect');
- o.value('echo-request');
+ o.value('required-option-missing');
o.value('router-advertisement');
o.value('router-solicitation');
+ o.value('source-quench');
+ o.value('source-route-failed');
o.value('time-exceeded');
- o.value('ttl-zero-during-transit');
- o.value('ttl-zero-during-reassembly');
- o.value('parameter-problem');
- o.value('ip-header-bad');
- o.value('required-option-missing');
- o.value('timestamp-request');
o.value('timestamp-reply');
- o.value('address-mask-request');
- o.value('address-mask-reply');
+ o.value('timestamp-request');
+ o.value('TOS-host-redirect');
+ o.value('TOS-host-unreachable');
+ o.value('TOS-network-redirect');
+ o.value('TOS-network-unreachable');
+ o.value('ttl-zero-during-reassembly');
+ o.value('ttl-zero-during-transit');
o.depends('proto', 'icmp');
o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 4d13752b3..78a662626 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -7,28 +7,22 @@
'require tools.widgets as widgets';
return L.view.extend({
- callOffloadSupport: rpc.declare({
- object: 'luci',
- method: 'offload_support',
- expect: { offload_support: false }
- }),
-
callConntrackHelpers: rpc.declare({
object: 'luci',
- method: 'conntrack_helpers',
- expect: { helpers: [] }
+ method: 'getConntrackHelpers',
+ expect: { result: [] }
}),
load: function() {
return Promise.all([
- this.callOffloadSupport(),
- this.callConntrackHelpers()
+ this.callConntrackHelpers(),
+ firewall.getDefaults()
]);
},
render: function(data) {
- var hasOffloading = data[0],
- ctHelpers = data[1],
+ var ctHelpers = data[0],
+ fwDefaults = data[1],
m, s, o, inp, out;
m = new form.Map('firewall', _('Firewall - Zone Settings'),
@@ -55,7 +49,7 @@ return L.view.extend({
/* Netfilter flow offload support */
- if (hasOffloading) {
+ if (L.hasSystemFeature('offloading')) {
s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'),
_('Experimental feature. Not fully compatible with QoS/SQM.'));
@@ -90,7 +84,8 @@ return L.view.extend({
o.modalonly = true;
o.cfgvalue = function(section_id) {
var name = uci.get('firewall', section_id, 'name');
-
+ if (name == null)
+ name = _("this new zone");
return _('This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are members of this zone.')
.replace(/%s/g, name).replace(/%q/g, '"' + name + '"');
};
@@ -98,11 +93,14 @@ return L.view.extend({
o = s.taboption('general', form.Value, 'name', _('Name'));
o.placeholder = _('Unnamed zone');
o.modalonly = true;
+ o.rmempty = false;
o.datatype = 'and(uciname,maxlength(11))';
o.write = function(section_id, formvalue) {
var cfgvalue = this.cfgvalue(section_id);
- if (cfgvalue != formvalue)
+ if (cfgvalue == null || cfgvalue == '')
+ return uci.set('firewall', section_id, 'name', formvalue);
+ else if (cfgvalue != formvalue)
return firewall.renameZone(cfgvalue, formvalue);
};
@@ -126,6 +124,10 @@ return L.view.extend({
p[i].editable = true;
}
+ p[0].default = fwDefaults.getInput();
+ p[1].default = fwDefaults.getOutput();
+ p[2].default = fwDefaults.getForward();
+
o = s.taboption('general', form.Flag, 'masq', _('Masquerading'));
o.editable = true;
@@ -167,13 +169,15 @@ return L.view.extend({
o.modalonly = true;
o.cfgvalue = function(section_id) {
var name = uci.get('firewall', section_id, 'name');
-
+ if (name == null)
+ name = _("this new zone");
return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
.format(name);
};
o = s.taboption('advanced', widgets.DeviceSelect, 'device', _('Covered devices'), _('Use this option to classify zone traffic by raw, non-<em>uci</em> managed network devices.'));
o.modalonly = true;
+ o.noaliases = true;
o.multiple = true;
o = s.taboption('advanced', form.DynamicList, 'subnet', _('Covered subnets'), _('Use this option to classify zone traffic by source or destination subnet instead of networks or devices.'));
@@ -256,8 +260,11 @@ return L.view.extend({
o.rawhtml = true;
o.modalonly = true;
o.cfgvalue = function(section_id) {
+ var name = uci.get('firewall', section_id, 'name');
+ if (name == null)
+ name = _("this new zone");
return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
- .format(uci.get('firewall', section_id, 'name'));
+ .format(name);
};
out = o = s.taboption('general', widgets.ZoneSelect, 'out', _('Allow forward to <em>destination zones</em>:'));
@@ -270,7 +277,7 @@ return L.view.extend({
o.cfgvalue = function(section_id) {
var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
- fwds = zone.getForwardingsBy(out ? 'src' : 'dest'),
+ fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [],
value = [];
for (var i = 0; i < fwds.length; i++)
@@ -281,7 +288,7 @@ return L.view.extend({
o.write = o.remove = function(section_id, formvalue) {
var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
- fwds = zone.getForwardingsBy(out ? 'src' : 'dest');
+ fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [];
if (formvalue == null)
formvalue = [];
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
deleted file mode 100644
index 38f36b49c..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ /dev/null
@@ -1,90 +0,0 @@
-<%-
- local fw = require "luci.model.firewall".init()
- local izl = { }
- local ezl = { }
- local _, z
- for _, z in ipairs(fw:get_zones()) do
- if z:name() ~= "wan" then
- izl[#izl+1] = z
- end
- if z:name() ~= "lan" then
- ezl[#ezl+1] = z
- end
- end
-
- local keys, vals = { }, { }
- luci.sys.net.ipv4_hints(function(ip, name)
- keys[#keys+1] = ip
- vals[#vals+1] = '%s (%s)' %{ ip, name }
- end)
--%>
-
-<h4><%:New port forward%></h4>
-<div class="table">
- <div class="tr table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Protocol%></div>
- <div class="th"><%:External zone%></div>
- <div class="th"><%:External port%></div>
- <div class="th"><%:Internal zone%></div>
- <div class="th"><%:Internal IP address%></div>
- <div class="th"><%:Internal port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
- <option value="tcp udp">TCP+UDP</option>
- <option value="tcp">TCP</option>
- <option value="udp">UDP</option>
- <option value="other"><%:Other...%></option>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
- <% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
- <% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", {keys, vals})
- %>/>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
- </div>
- </div>
-</div>
-
-<script type="text/javascript">//<![CDATA[
- document.getElementById('_newfwd.extport').addEventListener('blur',
- function() {
- var n = document.getElementById('_newfwd.name');
- var p = document.getElementById('_newfwd.proto');
- var i = document.getElementById('_newfwd.intport');
-
- if (!this.className.match(/invalid/))
- {
- if (!i.value) i.value = this.value;
-
- if (!n.value)
- {
- n.value = 'Forward' + this.value;
- }
- }
- });
-//]]></script>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
deleted file mode 100644
index e0092a7a5..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
- local fw = require "luci.model.firewall".init()
- local zones = fw:get_zones()
-%>
-
-<% if #zones > 0 then %>
- <h4><%:Open ports on router%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Protocol%></div>
- <div class="th"><%:External port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
- <option value="tcp udp">TCP+UDP</option>
- <option value="tcp">TCP</option>
- <option value="udp">UDP</option>
- <option value="other"><%:Other...%></option>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
- </div>
- </div>
- </div>
-<% end %>
-<% if #zones > 1 then %>
- <h4><%:New forward rule%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Source zone%></div>
- <div class="th"><%:Destination zone%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
- </div>
- </div>
- </div>
-<% else %>
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
-
-<% if #zones > 0 then %>
- <script type="text/javascript">//<![CDATA[
- cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
- document.getElementById('_newopen.extport').addEventListener('blur',
- function() {
- var n = document.getElementById('_newopen.name');
- var p = document.getElementById('_newopen.proto');
-
- if (!this.className.match(/invalid/))
- {
- if (!n.value && this.value)
- {
- n.value = 'Open' + this.value;
- }
- }
- });
- //]]></script>
-<% end %>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
deleted file mode 100644
index 0b4774ccc..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
- local fw = require "luci.model.firewall".init()
- local nw = require "luci.model.network".init()
- local zones = fw:get_zones()
-
- local keys, vals, a, k, v = {}, {}
- for k, v in ipairs(nw:get_interfaces()) do
- for k, a in ipairs(v:ipaddrs()) do
- keys[#keys+1] = a:host():string()
- vals[#vals+1] = '%s (%s)' %{ a:host(), v:shortname() }
- end
- end
-%>
-
-<% if #zones > 1 then %>
- <h4><%:New source NAT%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Source zone%></div>
- <div class="th"><%:Destination zone%></div>
- <div class="th"><%:To source IP%></div>
- <div class="th"><%:To source port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", { keys, vals })
- %> />
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
- </div>
- </div>
- </div>
-<% else %>
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index abb27d8b0..b5b395fb9 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -15,7 +15,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s en %s"
@@ -24,7 +24,7 @@ msgstr "%s en %s"
msgid "%s%s with %s"
msgstr "%s%s amb %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s en %s"
@@ -57,89 +57,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Acció"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Afegeix"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Afegeix i edita..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ajusts avançats"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permet el reenviament als <em>zones de destí</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Qualsevol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Xarxes cobertes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -158,17 +146,15 @@ msgstr ""
"ordres s'executen després de cada reinici de tallafocs, just després el "
"conjunt de regles per defecte s'ha carregat."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Adreça de destí"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Port de destí"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona de destí"
@@ -191,17 +177,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescriguis"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -217,64 +198,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Descarta els paquets invàlids"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilita"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Habilita protecció contra la inundació SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilita el registre d'aquesta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Adreça IP extern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona extern"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Paràmetres extres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -286,32 +261,32 @@ msgstr "Tallafocs"
msgid "Firewall - Custom Rules"
msgstr "Tallafocs - Regles personalitzades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Tallafocs - Reenviaments de port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Tallafocs - Regles de tràfic"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Tallafocs - Ajusts de zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Força el rastreig de connexió"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenvia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Reenvia a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -342,15 +317,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Ajusts generals"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -374,13 +349,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Només IPv4"
@@ -388,32 +363,29 @@ msgstr "Només IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Només IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Adreça IP interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Port intern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita els missatges de registre"
@@ -427,24 +399,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fixació MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascarada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Coincideix"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Coincideix amb el tipus ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -452,22 +424,18 @@ msgstr ""
"Coincideix amb trànsit entrant dirigit al port o rang de ports de destí en "
"aquest host donat"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -475,41 +443,19 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regla de reenviament"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regla d'entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nou reenviament de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nou origen NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Només coincideix amb trànsit entrant des d'aquests MAC."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Només coincideix amb trànsit entrant des d'aquest IP o rang."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -517,26 +463,17 @@ msgstr ""
"Només coincideix amb trànsit originant en el host client des del port o del "
"rang de ports d'origen donat"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Obre els ports en el encaminador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -545,12 +482,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Reenviaments de port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -558,25 +495,23 @@ msgstr ""
"El reenviament de ports permet que els ordinadors remots en el Internet "
"connectin a un ordinador o servei específic dins del LAN privat."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr "Redirigeix trànsit entrant coincidit al port donat en el host intern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
@@ -595,7 +530,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -603,20 +538,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringeix la mascarada a les subxarxes de destí donades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringeix a la família d'adreces"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -628,64 +563,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Adreça IP d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Adreça MAC d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Adreça d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Port d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
"flux de tràfic de xarxa."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
"de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -726,15 +659,15 @@ msgstr ""
"<em>Xarxes cobertes</em> especifica quines xarxes disponibles són membres "
"d'aquesta zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -754,20 +687,12 @@ msgstr "A %s en <var>aquest dispositiu</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A l'IP d'origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Al port d'origen"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Regles de trànsit"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -777,31 +702,31 @@ msgstr ""
"zones distintes, per exemple per a rebutjar trànsit entre certs hosts o "
"obrir ports WAN en el encaminador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -815,44 +740,44 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenviaments"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "qualsevol"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -866,7 +791,7 @@ msgstr "qualsevol IP d'encaminador"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualsevol zona"
@@ -876,13 +801,13 @@ msgstr "qualsevol zona"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "no rastregis"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descarta"
@@ -913,9 +838,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rebutja"
@@ -924,6 +849,12 @@ msgstr "rebutja"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -934,6 +865,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Afegeix i edita..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescriguis"
+
+#~ msgid "External zone"
+#~ msgstr "Zona extern"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regla de reenviament"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regla d'entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nou reenviament de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nou origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Obre els ports en el encaminador"
+
+#~ msgid "Other..."
+#~ msgstr "Altre..."
+
+#~ msgid "To source IP"
+#~ msgstr "A l'IP d'origen"
+
+#~ msgid "To source port"
+#~ msgstr "Al port d'origen"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada sense nom)"
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index dfe7c5bc9..b465d137f 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s v %s"
@@ -20,7 +20,7 @@ msgstr "%s v %s"
msgid "%s%s with %s"
msgstr "%s%s s %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s v %s"
@@ -53,89 +53,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Akce"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Přidat"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Přidat a upravit"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Pokročilé nastavení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Libovolné"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Pokryté sítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -153,17 +141,15 @@ msgstr ""
"nejsou jinak pokryté frameworkem firewallu. Příkazy jsou spuštěny po každém "
"restartu firewallu, právě po načtení výchozí sady pravidel."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Cílová adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Cílový port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Cílová oblast"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nepřepisovat"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -212,64 +193,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Zahazovat neplatné pakety"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Povolit"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Povolit NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Povolit ochranu proti SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Povolit logování v této oblasti"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Vnější IP adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Vnější port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Vnější zóna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatečné argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -281,32 +256,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Vlastní pravidla"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Přesměrování portů"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Pravidla síťového provozu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Nastavení zón"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Vynutit sledování připojení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Přesměrování"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Přesměrovat na"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -337,15 +312,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Obecné nastavení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -369,13 +344,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 a IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "pouze IPv4"
@@ -383,32 +358,29 @@ msgstr "pouze IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "pouze IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Vstup"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Vnitřní IP adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Vnitřní port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Vnitřní zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Omezit logovací zprávy"
@@ -422,24 +394,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maškárádování"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Shoda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Odpovídá ICMP typu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -447,22 +419,18 @@ msgstr ""
"Vybrat příchozí provoz, směrovaný na zadaný cílový port nebo rozsah portů "
"tohoto hostitele"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Název"
@@ -470,41 +438,19 @@ msgstr "Název"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nové pravidlo SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nové přesměrovací pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nové vstupní pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nové přesměrování portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nový zdrojový NAT (SNAT)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Vybrat pouze příchozí provoz z těchto MAC adres."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Vybrat pouze příchozí provoz z této IP nebo rozsahu IP adres."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -512,26 +458,17 @@ msgstr ""
"Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
"portů klienta."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otevřené porty na routeru"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Ostatní ..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Výstup"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Předává další argumenty iptables. Používat opatrně!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -540,12 +477,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Přesměrování portů"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -554,26 +491,24 @@ msgstr ""
"Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
"LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Přesměrovat vybraný příchozí provoz na uvedený port vnitřního hostitele."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele."
@@ -592,7 +527,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -600,20 +535,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Omezit maškarádování na uvedené cílové podsítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Omezit na rodinu adres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -625,64 +560,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Zdrojová IP adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Zdrojová MAC adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Zdrojová adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Zdrojový port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zdrojová zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -690,8 +623,8 @@ msgstr ""
"Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
"provozu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -707,7 +640,7 @@ msgstr ""
"Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
"lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -722,15 +655,15 @@ msgstr ""
"pro přesměrování provozu mezi rozdílnými sítěmi uvnitř jedné zóny.<em> "
"Pokryté sítě</em> určuje, které z dostupných sítí jsou členy této zóny."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -750,20 +683,12 @@ msgstr "Na %s na <var>tomto zařízení</var>"
msgid "To %s, %s in %s"
msgstr "Na %s, %s v %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Na zdrojovou IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Na zdrojový port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Pravidla síťového provozu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -773,31 +698,31 @@ msgstr ""
"různými zónami, například pro odmítnutí provozu mezi jistými hostiteli nebo "
"pro otevření WAN portů na routeru."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -811,44 +736,44 @@ msgstr "Prostřednictvím %s"
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Přesměrování"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zóny"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "přijmout"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "libovolný"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -862,7 +787,7 @@ msgstr "libovolná IP routeru"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "libovolná zóna"
@@ -872,13 +797,13 @@ msgstr "libovolná zóna"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "nesledovat"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "zahodit"
@@ -909,9 +834,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odmítnout"
@@ -920,6 +845,12 @@ msgstr "odmítnout"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -930,6 +861,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Přidat a upravit"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nepřepisovat"
+
+#~ msgid "External zone"
+#~ msgstr "Vnější zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nové pravidlo SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nové přesměrovací pravidlo"
+
+#~ msgid "New input rule"
+#~ msgstr "Nové vstupní pravidlo"
+
+#~ msgid "New port forward"
+#~ msgstr "Nové přesměrování portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nový zdrojový NAT (SNAT)"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otevřené porty na routeru"
+
+#~ msgid "Other..."
+#~ msgstr "Ostatní ..."
+
+#~ msgid "To source IP"
+#~ msgstr "Na zdrojovou IP"
+
+#~ msgid "To source port"
+#~ msgstr "Na zdrojový port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nepojmenovaný vstup)"
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index ba09ba196..23ab725a5 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s in %s"
@@ -22,7 +22,7 @@ msgstr "%s in %s"
msgid "%s%s with %s"
msgstr "%s%s mit %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s in %s"
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Aktion"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hinzufügen und bearbeiten..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "beliebig"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Abgedeckte Netzwerke"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,17 +144,15 @@ msgstr ""
"Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
"Laden der Basisregeln."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Zieladresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Zielport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Ziel-Zone"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nicht umschreiben"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Ungültige Pakete verwerfen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "NAT-Loopback aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Schutz vor SYN-flood-Attacken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Protokollierung innerhalb der Zone aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Externe IP-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Externer Port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Externe Zone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Zusätzliche Argumente"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -284,32 +259,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Benutzerdefinierte Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Portweiterleitungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
-msgstr "Firewall - Verkehrsregeln"
+msgstr "Firewall - Traffic-Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Zoneneinstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Connectiontracking erzwingen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Weitergeleitet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Weiterleiten an"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Freitag"
@@ -340,15 +315,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Allgemein"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Hardwarebeschleunigte Flusskontrolle"
@@ -372,13 +347,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 und IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "nur IPv4"
@@ -386,32 +361,29 @@ msgstr "nur IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "nur IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
-msgstr "Eingang"
+msgstr "Eingehend"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Interne IP-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Interner Port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Interne Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Protokollnachrichten limitieren"
@@ -425,24 +397,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Korrektur"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "NAT aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Filter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Nach ICMP-Typ filtern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -450,22 +422,18 @@ msgstr ""
"Eingehende Verbindungen filtern welche an den angegebenen Port oder "
"Portbereich auf dem lokalen Gerät gerichtet sind"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Montag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Monatstage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -473,68 +441,37 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Neue SNAT-Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Neuer Weiterleitungsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Neue Eingangsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Neue Portweiterleitung"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Neues SNAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
-msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
+msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
-msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
+msgstr "Selektiere nur Traffic von den angegebenen MAC-Adressen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
-msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
+msgstr "Selektiere nur Traffic vom angebenem Quell-IP-Adressbereich."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
-msgstr "Selektiere nur Verkehr von den angegebenen Quell-Ports auf dem Client."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports auf dem Router öffnen"
+msgstr "Selektiere nur Traffic von den angegebenen Quell-Ports auf dem Client."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Anderes..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
-msgstr "Ausgang"
+msgstr "Ausgehend"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
"benutzen!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -543,12 +480,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Portweiterleitungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -556,27 +493,25 @@ msgstr ""
"Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
"bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Gefilterte Verbindungen an den angegeben Port auf dem internen Host "
"weiterleiten"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
@@ -595,7 +530,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)"
@@ -604,20 +539,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Beschränke auf Adressfamilie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT-Beschleunigung"
@@ -629,73 +564,71 @@ msgstr "Regel ist deaktiviert"
msgid "Rule is enabled"
msgstr "Regel ist aktiviert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Samstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Softwarebasierte Auslagerung für Routing/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Beschleunigte Flusskontrolle"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Quell-IP-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Quell-MAC-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Quelladresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Quellport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Quell-Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (JJJJ-MM-TT)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Enddatum (JJJJ-MM-TT)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Sonntag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
-"den Netzverkehr zu trennen."
+"den Netzwerk-Traffic zu trennen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -704,16 +637,16 @@ msgid ""
"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-"Die untenstehenen Optionen regeln die Verfahreinsweisen für Verkehr zwischen "
+"Die untenstehenen Optionen regeln die Verfahreinsweisen für Traffic zwischen "
"dieser Zone (%s) und anderen Zonen. <em>Ziel-Zonen</em> decken "
-"weitergeleiteten Verkehr <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
-"treffen auf weitergeleiteten Verkehr aus anderen Zonen zu, welcher "
+"weitergeleiteten Traffic <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
+"treffen auf weitergeleiteten Traffic aus anderen Zonen zu, welcher "
"<strong>an %q gerichtet</strong> ist. Die Weiterleitung gilt nur in eine "
"Richtung, d.h. eine erlaubte Weiterleitung von LAN nach WAN impliziert "
"<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
"weiterzuleiten."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -724,20 +657,20 @@ msgid ""
msgstr ""
"Diese Sektion definiert allgemeine Eigenschaften der %q Zone. Die "
"<em>Eingang</em> und <em>Ausgang</em> Optionen regeln die Verfahrensweise "
-"für Verkehr der in diese Zone eintritt oder diese verlässt. "
-"<em>Weitergeleitet</em> trifft auf Verkehr zwischen verschiedenen "
+"für Traffic der in diese Zone eintritt oder diese verlässt. "
+"<em>Weitergeleitet</em> trifft auf Traffic zwischen verschiedenen "
"Schnittstellen innerhalb dieser Zone zu. <em>Abgedeckte Netzwerke</em> "
"definieren die Zugehörigkeit von Schnittstellen zu dieser Zone."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Donnerstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Zeit ist UTC"
@@ -757,54 +690,46 @@ msgstr "Zu %s auf <var>diesem Gerät</var>"
msgid "To %s, %s in %s"
msgstr "Zu %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Zu Quell-IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Zu Quell-Port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
-msgstr "Verkehrsregeln"
+msgstr "Traffic-Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-"Verkehrsregeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
-"zum Beispiel um Verkehr zwischen bestimmten Rechnern zu unterbinden oder um "
+"Traffic-Regeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
+"zum Beispiel um Traffic zwischen bestimmten Rechnern zu unterbinden oder um "
"WAN-Ports auf dem Router zu öffnen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Dienstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Unbenannte Portweiterleitung"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Unbennante Regel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -818,46 +743,46 @@ msgstr "Über %s"
msgid "Via %s at %s"
msgstr "Über %s an %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Mittwoch"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Wochentage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Weiterleitungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zonen"
# Die richtige Übersetzung von ACCEPT im Firewallkontext ist nicht "Annehmen" sondern "Zulassen". Man kann ja keinen
-# ausgehenden Verkehr annehmen.
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+# ausgehenden Traffic annehmen.
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "zulassen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "beliebig"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -871,7 +796,7 @@ msgstr "beliebige Router-IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "beliebige Zone"
@@ -881,13 +806,13 @@ msgstr "beliebige Zone"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "nicht verfolgen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "verwerfen"
@@ -918,9 +843,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "zurückweisen"
@@ -929,6 +854,12 @@ msgstr "zurückweisen"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -939,6 +870,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hinzufügen und bearbeiten..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nicht umschreiben"
+
+#~ msgid "External zone"
+#~ msgstr "Externe Zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Neue SNAT-Regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Neue Weiterleitungsregel"
+
+#~ msgid "New input rule"
+#~ msgstr "Neue eingehende Regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Neue Portweiterleitung"
+
+#~ msgid "New source NAT"
+#~ msgstr "Neues SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports auf dem Router öffnen"
+
+#~ msgid "Other..."
+#~ msgstr "Anderes..."
+
+#~ msgid "To source IP"
+#~ msgstr "Zu Quell-IP"
+
+#~ msgid "To source port"
+#~ msgstr "Zu Quell-Port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Unbenannter Eintrag)"
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 36e2e3a36..04cb7c343 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr "%s%s με %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Ενέργεια"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Προσθήκη και επεξεργασία..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ρυθμίσεις για προχωρημένους"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Οποιοδήποτε"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -152,17 +140,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Διεύθυνση προορισμού"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Θύρα προορισμού"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
#, fuzzy
msgid "Destination zone"
msgstr "Ζώνη προορισμού"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -212,65 +193,59 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Αγνόηση μη-έγκυρων πακετών"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Ενεργοποίηση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
#, fuzzy
msgid "Enable SYN-flood protection"
msgstr "Προστασία SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Εξωτερική διεύθυνση IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Επιπλέον παράμετροι"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -282,32 +257,32 @@ msgstr "Τείχος προστασίας"
msgid "Firewall - Custom Rules"
msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Τείχος προστασίας - Προώθηση Θυρών"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Επιβολή παρακολούθησης σύνδεσης"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Προώθηση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -338,15 +313,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Γενικές Ρυθμίσεις"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -370,13 +345,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 και IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Μόνο IPv4"
@@ -384,34 +359,31 @@ msgstr "Μόνο IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Μόνο IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Είσοδος"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
#, fuzzy
msgid "Internal IP address"
msgstr "Εσωτερική διεύθυνση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
#, fuzzy
msgid "Internal port"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Εσωτερική ζώνη"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Περιορισμός καταγραφών συστήματος"
@@ -425,46 +397,42 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "Περιορισμός MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Όνομα"
@@ -472,66 +440,35 @@ msgstr "Όνομα"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Άλλο..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Έξοδος"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -540,36 +477,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Προώθηση Θυρών"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Πρωτόκολλο"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -588,7 +523,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -596,20 +531,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -621,67 +556,65 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
#, fuzzy
msgid "Source IP address"
msgstr "Διεύθυνση MAC πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
#, fuzzy
msgid "Source address"
msgstr "Διεύθυνση MAC πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Θύρα πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
#, fuzzy
msgid "Source zone"
msgstr "Θύρα πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -689,8 +622,8 @@ msgstr ""
"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
"ελέγχει την δικτυακή κίνηση."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -709,15 +642,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -737,51 +670,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Ζώνες"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "αποδοχή"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -846,7 +771,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -856,13 +781,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "αγνόηση"
@@ -893,9 +818,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "απόρριψη"
@@ -904,6 +829,12 @@ msgstr "απόρριψη"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,5 +845,14 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Προσθήκη και επεξεργασία..."
+
+#~ msgid "Other..."
+#~ msgstr "Άλλο..."
+
#~ msgid "Destination IP address"
#~ msgstr "Διεύθυνση IP προορισμού"
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index 645560ca7..e38a33d2a 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -53,89 +53,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -150,17 +138,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Destination address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Destination port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Destination zone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -209,64 +190,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Drop invalid packets"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Enable SYN-flood protection"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -282,32 +257,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -338,15 +313,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -370,13 +345,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -384,32 +359,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Internal IP address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Internal port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -423,24 +395,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -448,22 +420,18 @@ msgstr ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -471,66 +439,35 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -539,37 +476,35 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Redirect matched incoming traffic to the given port on the internal host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirect matched incoming traffic to the specified internal host"
@@ -588,7 +523,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -596,20 +531,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -621,15 +556,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
@@ -663,52 +598,50 @@ msgstr ""
# msgid "Protocol"
# msgstr ""
#
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Source IP address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Source address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Source port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Source zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -716,8 +649,8 @@ msgstr ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -727,7 +660,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -736,15 +669,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -764,51 +697,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -822,44 +747,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "any"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -873,7 +798,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -883,13 +808,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -920,9 +845,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "reject"
@@ -931,6 +856,12 @@ msgstr "reject"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 7bb1a1e41..767da3f15 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2019-08-01 22:47-0300\n"
+"PO-Revision-Date: 2019-09-17 23:31-0300\n"
"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
"X-Generator: Poedit 2.2.3\n"
"Language-Team: \n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s en %s"
@@ -22,7 +22,7 @@ msgstr "%s en %s"
msgid "%s%s with %s"
msgstr "%s%s con %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s en %s"
@@ -56,24 +56,12 @@ msgstr "Aceptar entrada"
msgid "Accept output"
msgstr "Aceptar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Acción"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Añadir"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Añadir y editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
"solo coincida con el tráfico HTTPS saliente."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -92,61 +80,61 @@ msgstr ""
"tráfico de origen de zona, p.e. <code>-p tcp --sport 443</code> para que "
"solo coincida con el tráfico HTTPS entrante."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Configuración avanzada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Permitir tráfico \"inválido\""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir reenvío a <em>zonas de destino</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Cualquiera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "Cualquier día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Asignación automática de ayuda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
"Asigna automáticamente ayudantes de conntrack según el protocolo de tráfico "
"y el puerto"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr "Configuraciones de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Ayudantes de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Dispositivos cubiertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cubiertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Subredes cubiertas"
@@ -165,17 +153,15 @@ msgstr ""
"cualquier reinicio del FIrewall, justo tras haber cargado el conjunto de "
"reglas predeterminadas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Dirección de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Puerto de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona de destino"
@@ -198,7 +184,7 @@ msgstr "Descartar entrada"
msgid "Discard output"
msgstr "Descartar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"estado conntrack <em>inválido</em>. Esto puede ser necesario para "
"configuraciones complejas de rutas asimétricas."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescribir"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,66 +208,60 @@ msgstr "No seguir entrada"
msgid "Do not track output"
msgstr "No seguir salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Descartar paquetes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Habilitar bucle NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Habilitar protección contra inundaciones SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilitar registro en esta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
"Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
"para el tráfico de zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Dirección IP externa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Puerto externo"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Parámetros extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Argumentos de destino adicionales"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "Argumentos adicionales de iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Argumentos fuente adicionales"
@@ -298,32 +273,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reglas personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Reenvíos de puertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Reglas de tráfico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configuración de la zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forzar seguimiento de conexión"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenviar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Reenviar a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Viernes"
@@ -354,15 +329,15 @@ msgstr "Desde %s en <var>este dispositivo</var> con la fuente %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "De %s en <var>este dispositivo</var> con la fuente %s y %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Configuración general"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Flow Offloading por hardware"
@@ -386,13 +361,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Sólo IPv4"
@@ -400,32 +375,29 @@ msgstr "Sólo IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Sólo IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Dirección IP interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Puerto interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registro de mensajes"
@@ -439,24 +411,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fijado de MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Enmascaramiento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Coincidir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Coincidir con tipo ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -464,22 +436,18 @@ msgstr ""
"Coincidir con tráfico de entrada dirigido al puerto o rango de puertos "
"destino en este host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Lunes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Días del mes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nombre"
@@ -487,41 +455,19 @@ msgstr "Nombre"
msgid "Network"
msgstr "Red"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nueva regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nueva regla de reenvío"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nueva regla de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuevo reenvío de puerto"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuevo origen NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Coincidir sólo con tráfico de entrada desde estas MACs."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Coincidir sólo con tráfico de entrada desde esta IP o rango."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -529,26 +475,17 @@ msgstr ""
"Solo coincida con el tráfico entrante que se origina desde el puerto de "
"origen o el rango de puertos en el host del cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir puertos en el router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Otros..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Agrega más parámetros a iptables. ¡Utilice con cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -563,12 +500,12 @@ msgstr ""
"conjunto de reglas del firewall se rompa, exponiendo completamente todos los "
"servicios."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Reenvíos de puertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -576,7 +513,7 @@ msgstr ""
"El reenvío de puertos permite a ordenadores remotos en internet conectar a "
"un ordenador o servicio específico en la LAN privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -584,21 +521,19 @@ msgstr ""
"Evite la instalación de reglas <em>NOTRACK</em> que evitarían el seguimiento "
"de la conexión."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Redirigir el tráfico de entrada que coincida al puerto dado en el host "
"interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
"Redirigir el tráfico de entrada que coincida al host interno especificado"
@@ -618,7 +553,7 @@ msgstr "Rechazar entrada"
msgid "Refuse output"
msgstr "Rechazar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Requiere soporte de NAT por hardware. Implementado al menos para mt7621"
@@ -627,20 +562,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Reiniciar Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringir enmascaramiento a las subredes destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringir enmascaramiento a las subredes origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringir a la familia de direcciones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Enrutamiento/NAT Offloading"
@@ -652,64 +587,62 @@ msgstr "Regla deshabilitada"
msgid "Rule is enabled"
msgstr "Regla habilitada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Sábado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Offloading basado en software para enrutamiento/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Flow Offloading por software"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Dirección IP origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Dirección MAC origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Dirección de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Puerto de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Fecha de inicio (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "Hora de inicio (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Fecha de finalización (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "Hora de finalización (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Domingo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -717,8 +650,8 @@ msgstr ""
"El Firewall crea zonas sobre sus interfaces de red para controlar el flujo "
"del tráfico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -735,7 +668,7 @@ msgstr ""
"la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
"LAN también."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -750,15 +683,15 @@ msgstr ""
"<em>Redes cubiertas</em> especifican qué redes disponibles son miembros de "
"esta zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Jueves"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "Restricciones de tiempo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Tiempo en UTC"
@@ -778,20 +711,12 @@ msgstr "A %s por <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A IP origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "A puerto origen"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Reglas de tráfico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -801,25 +726,25 @@ msgstr ""
"diferentes zonas, por ejemplo, para rechazar el tráfico entre ciertos hosts "
"o para abrir puertos WAN en el enrutador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Martes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Reenvío sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Regla sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Zona sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -827,7 +752,7 @@ msgstr ""
"Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
"red no administrados <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -843,44 +768,44 @@ msgstr "Vía %s"
msgid "Via %s at %s"
msgstr "Vía %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Miércoles"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Días de la semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenvíos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "Aceptar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "cualquiera"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -894,7 +819,7 @@ msgstr "cualquier router IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "cualquier zona"
@@ -904,13 +829,13 @@ msgstr "cualquier zona"
msgid "day"
msgstr "Día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "No seguir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "Descartar"
@@ -941,9 +866,9 @@ msgstr "Puerto"
msgid "ports"
msgstr "Puertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Rechazar"
@@ -952,6 +877,12 @@ msgstr "Rechazar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "Esta nueva zona"
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -962,6 +893,45 @@ msgstr "Tipo"
msgid "types"
msgstr "Tipos"
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Añadir y editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescribir"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nueva regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nueva regla de reenvío"
+
+#~ msgid "New input rule"
+#~ msgstr "Nueva regla de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuevo reenvío de puerto"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuevo origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir puertos en el router"
+
+#~ msgid "Other..."
+#~ msgstr "Otros..."
+
+#~ msgid "To source IP"
+#~ msgstr "A IP origen"
+
+#~ msgid "To source port"
+#~ msgstr "A puerto origen"
+
#~ msgid "Output zone"
#~ msgstr "Zona de salida"
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 74af37802..7da22682b 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Paramètres avancés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permettre la transmission des <em>zones source</em> :"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permettre la transmission vers les <em>zones destination</em> :"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "N'importe lequel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Réseaux couverts"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -152,17 +140,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Adresse de destination"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Port de destination"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zone de destination"
@@ -185,17 +171,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Supprimer les paquets invalides"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Activer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Activer le NAT sur la boucle-locale"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Activer la protection contre le SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activer les traces (logs) sur cette zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Adresse IP externe"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Port externe"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zone externe"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -284,32 +259,32 @@ msgstr "Pare-feu"
msgid "Firewall - Custom Rules"
msgstr "Pare-feu -- Règles personnalisées"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Pare-feu -- Redirections de ports"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Pare-feu -- Règles de trafic"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Pare-feu - Configuration des zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forcer le suivi des connexions"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Transfert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Transférer à"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -340,15 +315,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Paramètres généraux"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -372,13 +347,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 et IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4 seulement"
@@ -386,32 +361,29 @@ msgstr "IPv4 seulement"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6 seulement"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrée"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Adresse IP interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Port interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zone interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limiter les messages de journalisation"
@@ -425,24 +397,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Contrainte du MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Type ICMP correspondant"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -450,22 +422,18 @@ msgstr ""
"Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
"gamme de ports) sur cet hôte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -473,66 +441,35 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nouvelle règle SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nouvelle règle d'entrée"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nouvelle redirection de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nouvelle source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Montrer seulement le trafic entrant provenant de ces adresses MAC."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports ouverts sur le routeur"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Autre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,12 +478,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Redirections de port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -554,27 +491,25 @@ msgstr ""
"La redirection de port permet aux ordinateurs distants sur Internet, de se "
"connecter à un ordinateur ou service spécifié dans le réseau local privé."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocole"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
"interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
@@ -593,7 +528,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -601,24 +536,24 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"destinataires"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"sources"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restreindre à cette famille d'adresses"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -630,15 +565,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
@@ -672,52 +607,50 @@ msgstr ""
# msgid "Protocol"
# msgstr ""
#
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Adresse IP source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Adresse MAC source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Adresse source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Port source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zone source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -725,8 +658,8 @@ msgstr ""
"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
"du trafic réseau."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -743,7 +676,7 @@ msgstr ""
"transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
"de transmission du WAN au LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -759,15 +692,15 @@ msgstr ""
"cette zone. Les <em>réseaux couverts</em> indiquent quels réseaux "
"disponibles sont membre de cette zone."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -787,51 +720,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Règles de trafic"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -845,45 +770,45 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Transmissions"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
#, fuzzy
msgid "any"
msgstr "tous"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -897,7 +822,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -907,13 +832,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "ignorer"
@@ -944,9 +869,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeter"
@@ -955,6 +880,12 @@ msgstr "rejeter"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -965,6 +896,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "External zone"
+#~ msgstr "Zone externe"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nouvelle règle SNAT"
+
+#~ msgid "New input rule"
+#~ msgstr "Nouvelle règle d'entrée"
+
+#~ msgid "New port forward"
+#~ msgstr "Nouvelle redirection de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nouvelle source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports ouverts sur le routeur"
+
+#~ msgid "Other..."
+#~ msgstr "Autre..."
+
#~ msgid "Destination IP address"
#~ msgstr "Adresse IP de destination"
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index cccedc020..b5e2e9a8d 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -50,89 +50,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -147,17 +135,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -275,32 +250,32 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -331,15 +306,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -363,13 +338,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -377,32 +352,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,45 +388,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,66 +430,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -578,7 +513,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -586,20 +521,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -611,71 +546,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -722,51 +655,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -878,9 +803,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 5a235d787..000c19f3d 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s %s-ban"
@@ -20,7 +20,7 @@ msgstr "%s %s-ban"
msgid "%s%s with %s"
msgstr "%s%s %s-el"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s %s-ben"
@@ -53,89 +53,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Művelet"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hozzáadás és szerkesztés..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Haladó beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Bármelyik"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Lefedett hálózatok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -154,17 +142,15 @@ msgstr ""
"lehetőséget. A parancsok a tűzfal minden újraindításakor futtatásra "
"kerülnek, közvetlenül az alapértelmezett szabálykészletek betöltése után."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Cél cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Cél port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Cél zóna"
@@ -187,17 +173,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ne írja felül"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -213,64 +194,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Érvénytelen csomagok eldobása"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Engedélyezés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "NAT visszacsatolás engedélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "SYN-flood védelem engedélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Naplózás engeélyezése ezen a zónán"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Külső IP cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Külső port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Külső zóna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "További argumentumok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -282,32 +257,32 @@ msgstr "Tűzfal"
msgid "Firewall - Custom Rules"
msgstr "Tűzfal - Egyéni szabályok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Tűzfal - Port továbbítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Tűzfal - Forgalmi szabályok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Tűzfal - Zóna beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Kapcsolat követés kényszerítése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Továbbítás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Továbbítás ennek"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -338,15 +313,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Általános beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -370,13 +345,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 és IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "csak IPv4"
@@ -384,32 +359,29 @@ msgstr "csak IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "csak IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Bemenet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Belső IP cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Belső port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Belső zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Napló üzenetek korlátozása"
@@ -423,24 +395,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping engegélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Álcázás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Szűrés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Szűrés ICMP típus alapján"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -448,22 +420,18 @@ msgstr ""
"Adott portra vagy port tartományra irányított bejövő forgalom szűrése ezen a "
"gépen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Név"
@@ -471,43 +439,21 @@ msgstr "Név"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Új SNAT szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Új továbbítási szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Új bemeneti szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Új port továbbítás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Új forrás NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Csak a megadott MAC címekről érkező bejövő forgalmat egyeztesse."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"Csak a megadott IP címről illetve IP címtartományból érkező bejövő forgalmat "
"egyeztesse."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -515,27 +461,18 @@ msgstr ""
"Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
"tartományába tartozó portról indított bejövő forgalmat egyeztesse."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Port megnyitása a routeren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Egyéb..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Kimenet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"További argumentumok küldése az iptables részére. Használja körültekintően!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Port továbbítás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -558,25 +495,23 @@ msgstr ""
"privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
"csatlakozását."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr "Átirányítja az egyező bejövő forgalmat a belső gép megadott portjához"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
@@ -595,7 +530,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -603,20 +538,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Korlátozás cím családra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -628,64 +563,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Forrás IP cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Forrás MAC cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Forrás cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Forrás port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Forrás zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
"A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
"forgalom áramlásának szabályozására."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -711,7 +644,7 @@ msgstr ""
"LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
"engedélyezett."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -727,15 +660,15 @@ msgstr ""
"<em>lefedett hálózatok</em> adják meg, hogy mely elérhető hálózatok tagjai "
"ennek a zónának."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -755,20 +688,12 @@ msgstr "%s-re a <var>eszközön</var>"
msgid "To %s, %s in %s"
msgstr "%s-re, %s %s-ben"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Forrás IP-re"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Forrás portra"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Forgalmi szabályok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -778,31 +703,31 @@ msgstr ""
"házirendet határozzák meg, például bizonyos gépek közötti forgalom "
"megakadályozához vagy WAN portok megnyitásához a routeren."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -816,44 +741,44 @@ msgstr "%s-en át"
msgid "Via %s at %s"
msgstr "%s-en át %s-nél"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Továbbítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zónák"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "elfogadás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "bármelyik"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -867,7 +792,7 @@ msgstr "bármelyik router IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "bármelyik zóna"
@@ -877,13 +802,13 @@ msgstr "bármelyik zóna"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "ne kövesse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "eldobás"
@@ -914,9 +839,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "visszautasítás"
@@ -925,6 +850,12 @@ msgstr "visszautasítás"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -935,6 +866,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hozzáadás és szerkesztés..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ne írja felül"
+
+#~ msgid "External zone"
+#~ msgstr "Külső zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Új SNAT szabály"
+
+#~ msgid "New forward rule"
+#~ msgstr "Új továbbítási szabály"
+
+#~ msgid "New input rule"
+#~ msgstr "Új bemeneti szabály"
+
+#~ msgid "New port forward"
+#~ msgstr "Új port továbbítás"
+
+#~ msgid "New source NAT"
+#~ msgstr "Új forrás NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Port megnyitása a routeren"
+
+#~ msgid "Other..."
+#~ msgstr "Egyéb..."
+
+#~ msgid "To source IP"
+#~ msgstr "Forrás IP-re"
+
+#~ msgid "To source port"
+#~ msgstr "Forrás portra"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Névtelen bejegyzés)"
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 5247eea37..aa522e2f2 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr "%s%s con %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Azione"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Aggiungi"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Aggiungi e modifica..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Opzioni Avanzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permetti routing da <em>zone di origine</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permetti rounting a <em>zone di destinazione</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Qualsiasi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Reti coperte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,17 +144,15 @@ msgstr ""
"comandi sono eseguiti dopo ogni riavvio del firewall, giusto dopo le altre "
"regole che sono state caricate."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Indirizzo di destinazione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Porta di destinazione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona di destinazione"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Non riscrivere"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Scarta pacchetti invalidi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Attiva"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Attiva NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Attiva protezione SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Attiva registro su questa zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Indirizzo IP Esterno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Porta Esterna"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona Esterna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Comandi extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -284,32 +259,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regole Personalizzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Inoltro Porte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regole Traffico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Opzioni delle Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forza tracciamento connessione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Inoltra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Inoltra a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Venerdì"
@@ -340,15 +315,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Opzioni Generali"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -372,13 +347,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Solo IPv4"
@@ -386,32 +361,29 @@ msgstr "Solo IPv4"
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Solo IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ingresso"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Indirizzo IP interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Porta interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita messaggi del registro"
@@ -425,24 +397,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Corrispondenza"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Corrispondenza tipo ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -450,22 +422,18 @@ msgstr ""
"Corrispondi traffico in entrata diretto alla porta o intervallo di porte "
"dato su questo host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Lunedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Giorni del Mese"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,41 +441,19 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nuova regola SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nuova regola di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nuova regola di ingresso"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuova porta di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuova sorgente NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Corrispondi solo traffico in entrata da questi MAC."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Corrispondi solo traffico in entrata da questo IP o intervallo."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -515,26 +461,17 @@ msgstr ""
"Corrispondi solo traffico in entrata originato dalla porta o intervallo di "
"porte sorgenti su host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Porte aperte sul router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altri..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa comandi addizionali a iptables. Usare con cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -543,12 +480,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Inoltri Porta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -556,25 +493,23 @@ msgstr ""
"L'inoltro delle porte permette ai computer in remoto su Internet di "
"connettersi a uno specifico computer o servizio presente nella LAN privata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocollo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr "Reindirizza il traffico in entrata alla porta data su host interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Reindirizza il traffico in entrata allo specifico host interno"
@@ -593,7 +528,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -601,20 +536,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Riavvia Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Limita il Masquerading alle subnet di destinazione date"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Limita il Masquerading alle subnet sorgente date"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Limita agli indirizzi famiglia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -626,15 +561,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Sabato"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
@@ -659,52 +594,50 @@ msgstr ""
# msgstr ""
# msgid "Protocol"
# msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Indirizzo IP di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Indirizzo MAC di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Indirizzo di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Porta di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Data di Inizio (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Data di Stop (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Domenica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -712,8 +645,8 @@ msgstr ""
"Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
"flusso del traffico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +663,7 @@ msgstr ""
"alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
"lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -745,15 +678,15 @@ msgstr ""
"differenti nella zona. Le <em>reti coperte</em> specificano quali reti "
"disponibili sono membri di questa zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Giovedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Orario in UTC"
@@ -773,20 +706,12 @@ msgstr "Verso %s su <var>questo dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Verso %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Verso IP sorgente"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Verso la porta sorgente"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Regole di Traffico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -796,31 +721,31 @@ msgstr ""
"tra zone differenti, per esempio per rifiutare il traffico tra certi host o "
"per aprire porte WAN sul router."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Martedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -834,44 +759,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Mercoledì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Giorni della Settimana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Inoltri"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accetta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "qualsiasi"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -885,7 +810,7 @@ msgstr "qualsiasi router IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualsiasi zona"
@@ -895,13 +820,13 @@ msgstr "qualsiasi zona"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "non tracciare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "scarta"
@@ -932,9 +857,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rifiuta"
@@ -943,6 +868,12 @@ msgstr "rifiuta"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -953,6 +884,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Aggiungi e modifica..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Non riscrivere"
+
+#~ msgid "External zone"
+#~ msgstr "Zona Esterna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nuova regola SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nuova regola di inoltro"
+
+#~ msgid "New input rule"
+#~ msgstr "Nuova regola di ingresso"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuova porta di inoltro"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuova sorgente NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Porte aperte sul router"
+
+#~ msgid "Other..."
+#~ msgstr "Altri..."
+
+#~ msgid "To source IP"
+#~ msgstr "Verso IP sorgente"
+
+#~ msgid "To source port"
+#~ msgstr "Verso la porta sorgente"
+
#~ msgid "Destination IP address"
#~ msgstr "Indirizzo IP destinazione"
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 85870605d..85702e60d 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"X-Generator: Poedit 2.2.3\n"
"Language-Team: \n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s (%s)"
@@ -22,7 +22,7 @@ msgstr "%s (%s)"
msgid "%s%s with %s"
msgstr "%s%s ,%s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s (%s)"
@@ -56,24 +56,12 @@ msgstr "入力を許可"
msgid "Accept output"
msgstr "出力を許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "追加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "追加及び編集..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"em> 引数です。(例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
"dport 443</code>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -92,61 +80,61 @@ msgstr ""
"em> 引数です。(例: HTTPS 受信トラフィックのみにマッチさせる <code>-p tcp --"
"sport 443</code>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "詳細設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "\"invalid\" トラフィックの許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>宛先ゾーン</em>への転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "全て"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "全日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "自動ヘルパー割り当て"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
"トラフィックのプロトコルとポートに基づいて、 conntrack ヘルパーを自動的に割り"
"当てます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr "Conntrack 設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Conntrack ヘルパー"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "カバーされるデバイス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "対象ネットワーク"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "カバーされるサブネット"
@@ -165,17 +153,15 @@ msgstr ""
"ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
"れます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "宛先アドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "宛先ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "宛先ゾーン"
@@ -198,7 +184,7 @@ msgstr "入力を破棄"
msgid "Discard output"
msgstr "出力を破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
"に必要となることがあります。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "リライトしない"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,64 +208,58 @@ msgstr "入力を追跡しない"
msgid "Do not track output"
msgstr "出力を追跡しない"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "無効なパケットを遮断する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "有効"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "NATループバックを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "SYN-Floodプロテクションを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "このゾーンのログ記録を有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr "ゾーン トラフィックのコネクション追跡ヘルパーを明示的に選択します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "外部IPアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "外部ポート"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部ゾーン"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "追加の引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "追加の送信先引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "追加の iptables 引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "追加の送信元引数"
@@ -296,32 +271,32 @@ msgstr "ファイアウォール"
msgid "Firewall - Custom Rules"
msgstr "ファイアウォール - 手動設定ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "ファイアウォール - ポートフォワーディング"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "ファイアウォール - トラフィック・ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "ファイアウォール - ゾーン設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制的にコネクション追跡を行う"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "転送"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "転送先"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "金曜日"
@@ -352,15 +327,15 @@ msgstr "送信元 %s, %s (<var>デバイス</var>)"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "送信元 %s, %s, %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "一般設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "ハードウェア フローオフロード"
@@ -384,13 +359,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4及びIPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4のみ"
@@ -398,32 +373,29 @@ msgstr "IPv4のみ"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6のみ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "受信"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "内部IPアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "内部ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "内部ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "ログメッセージを制限"
@@ -437,24 +409,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSSクランプ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "マスカレード"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "対象"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "ICMPタイプの一致"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -462,22 +434,18 @@ msgstr ""
"設定された宛先ポート(またはポート範囲)に一致した受信トラフィックが対象になり"
"ます"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "月曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "月間"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名前"
@@ -485,43 +453,21 @@ msgstr "名前"
msgid "Network"
msgstr "ネットワーク"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "転送ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "受信ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "転送設定の新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "設定されたMACアドレスと一致した受信したトラフィックが対象になります。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"設定されたIPアドレス (または範囲) と一致した受信したトラフィックが対象になり"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -529,28 +475,19 @@ msgstr ""
"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
"フィックと一致したトラフィックのみを対象にします。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "ポートの開放"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "その他のプロトコル"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "送信"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
"てください!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -564,12 +501,12 @@ msgstr ""
"し、全サービスを外部に晒す恐れがあることに、特段の注意を払い使用されなければ"
"なりません。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "ポートフォワーディング"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -578,7 +515,7 @@ msgstr ""
"ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -586,20 +523,18 @@ msgstr ""
"コネクション追跡をバイパスさせる <em>NOTRACK</em> ルールのインストールを防ぎ"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "プロトコル"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"ルールに一致した受信トラフィックを、内部ホストの設定されたポートへ転送します"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
@@ -618,7 +553,7 @@ msgstr "入力を拒否"
msgid "Refuse output"
msgstr "出力を拒否"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"ハードウェア NAT サポートが必要です。 mt7621 のみにおいて実装されています。"
@@ -627,20 +562,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "ファイアウォールの再起動"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "設定された宛先サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "設定された送信元サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "アドレスファミリの制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "ルーティング/NAT オフロード"
@@ -652,64 +587,62 @@ msgstr "ルールは無効です"
msgid "Rule is enabled"
msgstr "ルールは有効です"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "土曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "ソフトウェア フローオフロード"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "送信元IPアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "送信元MACアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "送信元アドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "送信元ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "送信元ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "開始時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "停止時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "日曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -717,8 +650,8 @@ msgstr ""
"ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
"ラフィックの制御を行います。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -734,7 +667,7 @@ msgstr ""
"向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
"ません。</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -748,15 +681,15 @@ msgstr ""
"準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
"のゾーンに属するかを設定します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "木曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "時間制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "UTC時刻を使用"
@@ -776,20 +709,12 @@ msgstr "宛先 %s (<var>デバイス</var>)"
msgid "To %s, %s in %s"
msgstr "宛先 %s, %s (%s)"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "変換後送信元IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "変換後送信元ポート"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "トラフィック・ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -799,25 +724,25 @@ msgstr ""
"します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
"設定することができます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "火曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "名称未設定の転送"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "名称未設定のルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "名称未設定のゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -825,7 +750,7 @@ msgstr ""
"生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
"分にこのオプションを使用します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -841,44 +766,44 @@ msgstr "経由 %s"
msgid "Via %s at %s"
msgstr "経由 %s , %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "水曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "ゾーン ⇒ 転送"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "全て"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -892,7 +817,7 @@ msgstr "全てのルーターIP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "全てのゾーン"
@@ -902,13 +827,13 @@ msgstr "全てのゾーン"
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "コネクション追跡を行わない"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "破棄"
@@ -939,9 +864,9 @@ msgstr "ポート"
msgid "ports"
msgstr "ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒否"
@@ -950,6 +875,12 @@ msgstr "拒否"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -959,3 +890,42 @@ msgstr "タイプ"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "タイプ"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "追加及び編集..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "リライトしない"
+
+#~ msgid "External zone"
+#~ msgstr "外部ゾーン"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "New forward rule"
+#~ msgstr "転送ルールの新規作成"
+
+#~ msgid "New input rule"
+#~ msgstr "受信ルールの新規作成"
+
+#~ msgid "New port forward"
+#~ msgstr "転送設定の新規作成"
+
+#~ msgid "New source NAT"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "Open ports on router"
+#~ msgstr "ポートの開放"
+
+#~ msgid "Other..."
+#~ msgstr "その他のプロトコル"
+
+#~ msgid "To source IP"
+#~ msgstr "変換後送信元IP"
+
+#~ msgid "To source port"
+#~ msgstr "変換後送信元ポート"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index 2346b9556..c916d1122 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr "%s%s ,%s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "추가 후 수정..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>Source zone</em> 로부터의 forward 허용:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>Destination zone</em> 으로 forward 허용:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -155,17 +143,15 @@ msgstr ""
"수 있도록 합니다. 입력된 명령어들은 매 방화벽 재시작시 실행되는데 default "
"ruleset 이 load 된 후 시점입니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Destination 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -188,17 +174,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -214,64 +195,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "NAT Loopback 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "SYN-flood protection 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "zone 의 logging 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "외부 IP 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "외부 port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "외부 zone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "추가 argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -283,32 +258,32 @@ msgstr "방화벽"
msgid "Firewall - Custom Rules"
msgstr "방화벽 - Custom Rules"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "방화벽 - Port Forwards"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "방화벽 - Traffic Rules"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "방화벽 - Zone 설정"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "금요일"
@@ -339,15 +314,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -371,13 +346,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -385,32 +360,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "내부 IP 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "내부 port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "내부 zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -424,45 +396,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "월요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "이름"
@@ -470,66 +438,35 @@ msgstr "이름"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "새로운 SNAT rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "새로운 forward rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "새로운 input rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "새로운 port forward"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "새로운 source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "iptables 명령에 추가 인자들을 더합니다. 조심해 사용하세요!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -538,12 +475,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Port Forward"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -551,25 +488,23 @@ msgstr ""
"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
"나 서비스에 접속할 수 있도록 합니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -588,7 +523,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -596,20 +531,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "주어진 destination subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "주어진 source subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Address family 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -621,64 +556,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "토요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Source IP 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Source MAC 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Source 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "시작 날짜 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "종료 날짜 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "일요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -686,8 +619,8 @@ msgstr ""
"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
"를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -703,7 +636,7 @@ msgstr ""
"<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
"WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -718,15 +651,15 @@ msgstr ""
"를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> "
"에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "목요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "UTC 기준시"
@@ -746,20 +679,12 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Traffic Rule"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -769,31 +694,31 @@ msgstr ""
"다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 "
"open 할때 사용됩니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "화요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -807,44 +732,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "수요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "주일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zone 내역"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -858,7 +783,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -868,13 +793,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -905,9 +830,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -916,6 +841,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -926,6 +857,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add and edit..."
+#~ msgstr "추가 후 수정..."
+
+#~ msgid "External zone"
+#~ msgstr "외부 zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "새로운 SNAT rule"
+
+#~ msgid "New forward rule"
+#~ msgstr "새로운 forward rule"
+
+#~ msgid "New input rule"
+#~ msgstr "새로운 input rule"
+
+#~ msgid "New port forward"
+#~ msgstr "새로운 port forward"
+
+#~ msgid "New source NAT"
+#~ msgstr "새로운 source NAT"
+
#~ msgid "Destination IP address"
#~ msgstr "Destination IP 주소"
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index cab21a0ff..56a0f053e 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -7,7 +7,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -49,89 +49,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -146,17 +134,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -179,17 +165,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -205,64 +186,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -274,32 +249,32 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -330,15 +305,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -362,13 +337,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -376,32 +351,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -415,45 +387,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -461,66 +429,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -529,36 +466,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -577,7 +512,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -585,20 +520,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -610,71 +545,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -684,7 +617,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -693,15 +626,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -721,51 +654,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -779,44 +704,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -830,7 +755,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -840,13 +765,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -877,9 +802,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -888,6 +813,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index 91c01a4e9..625a6a363 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s i %s"
@@ -17,7 +17,7 @@ msgstr "%s i %s"
msgid "%s%s with %s"
msgstr "%s%s med %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s i %s"
@@ -50,89 +50,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Handling"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Legg til"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Legg til og redigere..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillat videresending fra <em>kilde soner</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Tillat videresending til <em>destinasjon soner</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Enhver"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Gjeldene nettverk"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -150,17 +138,15 @@ msgstr ""
"som ikke dekkes av brannmurens standardoppsett. Kommandoene utføres etter "
"hver omstart av brannmuren, rett etter at standard regelsett er lastet."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Destinasjon adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Destinasjon port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Destinasjon sone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ikke omskriv"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -209,64 +190,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Forkast ugyldige pakker"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktiver"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Aktiver SYN-flood beskyttelse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktiver logging av denne sonen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Ekstern IP adressse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Ekstern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Ekstern sone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Ekstra argumenter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -278,33 +253,33 @@ msgstr "Brannmur"
msgid "Firewall - Custom Rules"
msgstr "Brannmur - Egendefinerte Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Brannmur - Port Videresending"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Brannmur - Trafikk Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Brannmur - Sone Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
"Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Videresend"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Videresend til"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -335,15 +310,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Generelle Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -367,13 +342,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 og IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Kun IPv4"
@@ -381,32 +356,29 @@ msgstr "Kun IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Kun IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inndata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Intern IP adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Intern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Intern sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begrens logging"
@@ -420,24 +392,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Kontroll (Clamping)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Match"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Match ICMP type"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -445,22 +417,18 @@ msgstr ""
"Match innkommende trafikk rettet mot den oppgitte destinasjonsport eller "
"portområdet på denne verten"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Navn"
@@ -468,41 +436,19 @@ msgstr "Navn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny videresending regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inndata regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny port videresending"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny kilde NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Match kun innkommende trafikk fra disse MAC adresser."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Match kun innkommende trafikk fra denne IP eller IP område."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -510,26 +456,17 @@ msgstr ""
"Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
"fra portområdet til klienten"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Åpne porter på ruteren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utdata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -538,12 +475,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Port Videresendinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -551,27 +488,25 @@ msgstr ""
"Port videresending tillater at eksterne datamaskiner på Internett kan koble "
"seg til en bestemt maskin eller tjeneste innenfor det private LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Viderekoble matchet innkommende trafikk til den oppgitte porten på intern "
"vert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
@@ -590,7 +525,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -598,20 +533,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Begrens til adresse familie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -623,64 +558,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Kilde IP adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Kilde MAC adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Kilde adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Kilde port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Kilde sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -688,8 +621,8 @@ msgstr ""
"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
"nettverkstrafikken."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgstr ""
"ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
"<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -721,15 +654,15 @@ msgstr ""
"spesifiserer hvilken av de tilgjengelige nettverk som er medlem av denne "
"sone."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -749,20 +682,12 @@ msgstr "Til %s på <var>denne enheten</var>"
msgid "To %s, %s in %s"
msgstr "Til %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Til kilde IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Til kilde port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Trafikk Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -772,31 +697,31 @@ msgstr ""
"for eksempel for å avvise trafikk mellom visse verter eller for å åpne WAN "
"porter på ruteren."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -810,44 +735,44 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s på %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Sone = Videresendinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Soner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "godta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "enhver"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -861,7 +786,7 @@ msgstr "enhver ruter IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "enhver sone"
@@ -871,13 +796,13 @@ msgstr "enhver sone"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "ikke track"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "forkast"
@@ -908,9 +833,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "avslå"
@@ -919,6 +844,12 @@ msgstr "avslå"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -929,6 +860,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Legg til og redigere..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ikke omskriv"
+
+#~ msgid "External zone"
+#~ msgstr "Ekstern sone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny videresending regel"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inndata regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny port videresending"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny kilde NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Åpne porter på ruteren"
+
+#~ msgid "Other..."
+#~ msgstr "Andre..."
+
+#~ msgid "To source IP"
+#~ msgstr "Til kilde IP"
+
+#~ msgid "To source port"
+#~ msgstr "Til kilde port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(oppføring uten navn)"
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 94b6e924f..5c96d57b7 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -14,7 +14,7 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s w %s"
@@ -23,7 +23,7 @@ msgstr "%s w %s"
msgid "%s%s with %s"
msgstr "%s%s z %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s w %s"
@@ -57,89 +57,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Działanie"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Dodaj"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Dodaj i edytuj..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Każdy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Objęte sieci"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -157,17 +145,15 @@ msgstr ""
"są objęte składnią zapory. Polecenia wykonywane są po każdym restarcie "
"zapory, zaraz po załadowaniu zestawu reguł domyślnych."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Adres docelowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Port docelowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Strefa docelowa"
@@ -190,17 +176,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nie przepisuj"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -216,64 +197,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Porzuć wadliwe pakiety"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Włącz"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Włącz NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Włącz ochronę przed atakiem SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Włącz logowanie na tej strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Zewnętrzne adresy IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Port zewnętrzny"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Strefa zewnętrzna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatkowe argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -288,32 +263,32 @@ msgstr "Zapora"
msgid "Firewall - Custom Rules"
msgstr "Zapora - Reguły własne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Zapora - Przekazywanie portów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Zapora - Reguły ruchu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Zapora - Ustawienia strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Wymuś śledzenie połączeń"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Przekazuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Przekazuj do"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -344,15 +319,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Ustawienia ogólne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -376,13 +351,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Tylko IPv4"
@@ -390,32 +365,29 @@ msgstr "Tylko IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Tylko IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ruch przychodzący"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Wewnętrzny adres IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Wewnętrzny port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Strefa wewnętrzna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ograniczenie logowania"
@@ -429,24 +401,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Dostosuj MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskarada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Dopasuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Dopasuj typ ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -454,22 +426,18 @@ msgstr ""
"Dopasuj ruch przychodzący do danego portu docelowego lub zakresu portów na "
"tym hoście"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nazwa"
@@ -477,41 +445,19 @@ msgstr "Nazwa"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nowa reguła SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nowa reguła przekazywania (forward)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nowa reguła wejściowa (input)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nowe przekierowanie portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nowy NAT źródłowy"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Dopasuj tylko ruch z tych adresów MAC."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Dopasuj tylko ruch przychodzący z tego adresu IP lub zakresu adresów."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -519,27 +465,18 @@ msgstr ""
"Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
"portów na hoście klienta"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otwarte porty na routerze"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Inne..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Wyjście (Output)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -548,12 +485,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Przekierowania portów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -561,27 +498,25 @@ msgstr ""
"Przekierowanie portów pozwala komputerom z internetu na połączenia z "
"komputerami z sieci LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokół"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Przekieruj ruch przychodzący na podany port do wskazanego hosta w sieci "
"wewnętrznej"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
@@ -600,7 +535,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -608,22 +543,22 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych"
# Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
# Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Ogranicz do rodziny adresów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -635,64 +570,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Źródłowy adres IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Źródłowy adres MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Adres źródłowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Port źródłowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Strefa źródłowa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -700,8 +633,8 @@ msgstr ""
"Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
"sieciowy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -717,7 +650,7 @@ msgstr ""
"przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
"do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -732,15 +665,15 @@ msgstr ""
"politykę ruchu przekazywanego pomiędzy różnymi sieciami wewnątrz strefy. "
"<em>Objęte sieci</em> określają dostępne sieci będące członkami tej strefy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -760,20 +693,12 @@ msgstr "Do %s na <var>tym urządzeniu</var>"
msgid "To %s, %s in %s"
msgstr "Do %s, %s w %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Do źródłowego IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Do źródłowego portu"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Reguły ruchu sieciowego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -783,31 +708,31 @@ msgstr ""
"między strefami, na przykład aby odrzucać ruch między konkretnymi hostami "
"albo otworzyć porty WAN routera."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -821,44 +746,44 @@ msgstr "Przez %s"
msgid "Via %s at %s"
msgstr "Przez %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Strefa ⇒ Przekazywanie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "akceptuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "dowolny"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -872,7 +797,7 @@ msgstr "dowolne IP routera"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "dowolna strefa"
@@ -882,13 +807,13 @@ msgstr "dowolna strefa"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "nie śledź"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "porzucaj"
@@ -919,9 +844,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odrzucaj"
@@ -930,6 +855,12 @@ msgstr "odrzucaj"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -940,6 +871,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Dodaj i edytuj..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nie przepisuj"
+
+#~ msgid "External zone"
+#~ msgstr "Strefa zewnętrzna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nowa reguła SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nowa reguła przekazywania (forward)"
+
+#~ msgid "New input rule"
+#~ msgstr "Nowa reguła wejściowa (input)"
+
+#~ msgid "New port forward"
+#~ msgstr "Nowe przekierowanie portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nowy NAT źródłowy"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otwarte porty na routerze"
+
+#~ msgid "Other..."
+#~ msgstr "Inne..."
+
+#~ msgid "To source IP"
+#~ msgstr "Do źródłowego IP"
+
+#~ msgid "To source port"
+#~ msgstr "Do źródłowego portu"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nienazwany wpis)"
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 4f415d7ab..692640254 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"X-Generator: Poedit 2.1.1\n"
"Language-Team: \n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s in %s"
@@ -22,7 +22,7 @@ msgstr "%s in %s"
msgid "%s%s with %s"
msgstr "%s%s com %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s em %s"
@@ -55,89 +55,77 @@ msgstr "Aceitar a entrada"
msgid "Accept output"
msgstr "Aceitar a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Ação"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Configurações Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Qualquer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cobertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -155,17 +143,15 @@ msgstr ""
"cobertos por esta ferramenta. Os comandos serão executados após cada "
"reinício do firewall, logo após a carga do conjunto de regras padrão."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Endereço de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Porta de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona de destino"
@@ -188,17 +174,12 @@ msgstr "Descartar a entrada"
msgid "Discard output"
msgstr "Descartar a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não sobrescreva"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -214,65 +195,59 @@ msgstr "Não rastrear a entrada"
msgid "Do not track output"
msgstr "Não rastrear a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Descartar pacotes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Habilite o Loopback do NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Habilite proteção contra SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilite o registro nesta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
"Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Endereço IP externo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Porta Externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extras"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -284,32 +259,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Encaminhamento de Portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regras de Tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configurações de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Force o rastreamento da conexão"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Encaminhar para"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Sexta-feira"
@@ -340,15 +315,15 @@ msgstr "De %s <var>neste dispositivo</var> com origem %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "De %s <var>neste dispositivo</var> com origem %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Configurações Gerais"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Aceleração de fluxo de dados via Hardware"
@@ -372,13 +347,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Somente IPv4"
@@ -386,32 +361,29 @@ msgstr "Somente IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Somente IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Endereço IP interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Porta Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita as mensagens de registro"
@@ -425,24 +397,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajuste do MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascaramento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Casa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Casa com ICMP tipo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -450,22 +422,18 @@ msgstr ""
"Casa o tráfego entrante direcionado para uma porta ou faixa de portas de "
"destino específica neste computador"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Segunda-Feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Dias do mês"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,42 +441,20 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra de SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
"Somente case o tráfego entrante direcionado para o endereço IP fornecido."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Somente case o tráfego entrante destes endereços MAC."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Somente case o tráfego entrante desta faixa de endereços IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -516,26 +462,17 @@ msgstr ""
"Somente case o tráfego entrante vindo da porta de origem fornecida ou "
"intervalo de portas no equipamento cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no roteador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Encaminhamentos de Porta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -557,26 +494,24 @@ msgstr ""
"O encaminhamento de portas permite que computadores remotos na Internet "
"conectem a um computador ou serviço específico dentro da rede local privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Redireciona tráfego entrante para a porta especificada no computador interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redireciona tráfego entrante para o computador interno especificado"
@@ -595,7 +530,7 @@ msgstr "Recusar entrada"
msgid "Refuse output"
msgstr "Recusar saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
@@ -603,20 +538,20 @@ msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
msgid "Restart Firewall"
msgstr "Reiniciar o Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringe o mascaramento para uma subrede de destino específica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringe o mascaramento para uma subrede de origem específica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringe para uma família de endereços"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Aceleração de Roteamento/NAT"
@@ -628,64 +563,62 @@ msgstr "A regra está desabilitada"
msgid "Rule is enabled"
msgstr "A regra está habilitada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Sábado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Aceleração de roteamento/NAT baseada em Software"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Aceleração de fluxo de dados via Software"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Endereço IP de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Endereço MAC de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Endereço de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Dia inicial (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Dia final (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Domingo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego de rede."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
"WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -725,15 +658,15 @@ msgstr ""
"<em>Redes Cobertas</em> especificam que redes disponíveis são membros desta "
"zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Quita-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Hora em UTC"
@@ -753,20 +686,12 @@ msgstr "Para %s <var>neste dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o endereço IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Regras de tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -776,31 +701,31 @@ msgstr ""
"diferentes zonas. Por exemplo, rejeitar o tráfego entre certos equipamentos "
"ou abrir portas WAN no roteador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Terça-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Encaminhamento sem nome"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Regra sem nome"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -814,44 +739,44 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s at %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Quarta-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Dias da semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "qualquer"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -865,7 +790,7 @@ msgstr "qualquer endereço IP do roteador"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualquer zona"
@@ -875,13 +800,13 @@ msgstr "qualquer zona"
msgid "day"
msgstr "dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "não rastrear"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descartar"
@@ -912,9 +837,9 @@ msgstr "porta"
msgid "ports"
msgstr "portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -923,6 +848,12 @@ msgstr "rejeitar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -933,6 +864,45 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não sobrescreva"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra de SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no roteador"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o endereço IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "Output zone"
#~ msgstr "Zona de saída"
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 8dde627c0..281c6b17b 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s em %s"
@@ -22,7 +22,7 @@ msgstr "%s em %s"
msgid "%s%s with %s"
msgstr "%s%s with %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s em %s"
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Acção"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Definições Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir encaminhamento para <em>zonas de destino</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Qualquer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes abrangidas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,17 +144,15 @@ msgstr ""
"comandos são executados a seguir ao reinicio da firewall, logo a seguir ao "
"conjunto de regras predefinidas serem carregadas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Endereço de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Porta de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona de destino"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não re-escrever"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Cancelar pacotes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Ativar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Ativar NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Ativar a Proteção SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Ativar registo nesta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Endereço IP externo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Porta externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -284,32 +259,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras Personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Firewall - Encaminhamento de Portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regras de Tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Firewall - Definições de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forçar rasto de ligação"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Encaminhar para"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -340,15 +315,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Definições Gerais"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -372,13 +347,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Só IPv4"
@@ -386,32 +361,29 @@ msgstr "Só IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Só IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Endereço IP interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Porta interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registo de mensagens"
@@ -425,25 +397,25 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS-Correction"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Corresponder"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -451,22 +423,18 @@ msgstr ""
"O tráfego de entrada corresponde a uma dada porta de destino ou intervalo de "
"portas neste host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -474,41 +442,19 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem de NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Só se o tráfego de entrada corresponder a um destes MACs."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Só se o tráfego de entrada corresponder a este IP ou intervalo."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -516,26 +462,17 @@ msgstr ""
"Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
"intervalo de portas no host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Encaminhamento de Portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -557,27 +494,25 @@ msgstr ""
"O Encaminhamento de Portas permite que computadores remotos na internet se "
"liguem a um computador ou serviço especifico na rede privada (LAN)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Redirecionar a entrada de trafego correspondente à porta fornecida no host "
"interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
@@ -596,7 +531,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -604,20 +539,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringir a família de endereços"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -629,64 +564,62 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Endereço IP de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Endereço MAC de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Endereço de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -694,8 +627,8 @@ msgstr ""
"A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -714,15 +647,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -742,20 +675,12 @@ msgstr "Para %s em <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Regras de Tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -765,31 +690,31 @@ msgstr ""
"diferentes zonas, por exemplo, para rejeitar trafego entre certos hosts ou "
"para abrir portas WAN no router."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,44 +728,44 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s no %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "qualquer"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -854,7 +779,7 @@ msgstr "qualquer IP do router"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualquer zona"
@@ -864,13 +789,13 @@ msgstr "qualquer zona"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "não seguir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -901,9 +826,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -912,6 +837,12 @@ msgstr "rejeitar"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -922,6 +853,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não re-escrever"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem de NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no router"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada Sem Nome)"
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 92c8b8a9a..30d3d89e5 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -12,7 +12,7 @@ msgstr ""
"20)) ? 1 : 2);;\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s în %s"
@@ -21,7 +21,7 @@ msgstr "%s în %s"
msgid "%s%s with %s"
msgstr "%s%s cu %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s în %s"
@@ -54,89 +54,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Acţiune"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adaugă"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adaugă şi editează..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Setări avansate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite trecerea din <em>zonele sursa</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite trecerea catre <em>zonele sursa</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Oricare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Retele acoperite"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -151,17 +139,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Destinaţie adresă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Portul destinatie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Zona destinatie"
@@ -184,17 +170,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nu rescrie"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -210,64 +191,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Descarcă pachetele invalide"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Activează"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Activează loopback NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Activează protecţia SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activeaza log in aceasta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Adresă IP externă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zonă externă"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -279,32 +254,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reguli particularizate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Setari zona la firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forteaza urmarirea conexiunilor"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -335,15 +310,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Setari generale"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -367,13 +342,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 şi IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "doar IPv4"
@@ -381,32 +356,29 @@ msgstr "doar IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "doar IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Intrare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Adresa IP interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Port intern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Zonă internă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitează mesaje în log"
@@ -420,45 +392,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajustare MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Translatare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Potrivire"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Potriveste pe tipul de ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nume"
@@ -466,66 +434,35 @@ msgstr "Nume"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Regulă nouă SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altele..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Ieşire"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -534,36 +471,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -582,7 +517,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -590,20 +525,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -615,71 +550,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "Sursă adresă IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "Sursă adresă MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Adresa sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Port sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Zona sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -698,15 +631,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -726,51 +659,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -784,44 +709,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "oricare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -835,7 +760,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -845,13 +770,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -882,9 +807,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -893,6 +818,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,24 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adaugă şi editează..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nu rescrie"
+
+#~ msgid "External zone"
+#~ msgstr "Zonă externă"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Regulă nouă SNAT"
+
+#~ msgid "Other..."
+#~ msgstr "Altele..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Intrare fără nume)"
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index ab747e19a..ca8dc439c 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s в %s"
@@ -24,7 +24,7 @@ msgstr "%s в %s"
msgid "%s%s with %s"
msgstr "%s%s с %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s в %s"
@@ -57,24 +57,12 @@ msgstr "Принимать входящий трафик"
msgid "Accept output"
msgstr "Принимать исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Действие"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Добавить"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Добавить и редактировать..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -84,70 +72,70 @@ msgstr ""
"назначения, например <code>-p tcp --dport 443</code> для соответствия только "
"исходящему HTTPS трафику."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны источника, "
-"например <code>-p tcp --sport 443</code> для соответствия только входящему HTTPS "
-"трафику."
+"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны "
+"источника, например <code>-p tcp --sport 443</code> для соответствия только "
+"входящему HTTPS трафику."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Дополнительные настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Разрешить «недействительный» трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Любой"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "Любой день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматическое назначение помощников"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-"Автоматическое назначение помощников отслеживания соединений (conntrack) на основе "
-"протокола и порта трафика."
+"Автоматическое назначение помощников отслеживания соединений (conntrack) на "
+"основе протокола и порта трафика."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr "Отслеживание соединений (conntrack)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Помощники отслеживания соединений"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охватываемые устройства"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охватываемые сети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охватываемые подсети"
@@ -166,17 +154,15 @@ msgstr ""
"каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил "
"по умолчанию."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Адрес назначения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Порт назначения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Зона назначения"
@@ -199,19 +185,14 @@ msgstr "Отклонять входящий трафик"
msgid "Discard output"
msgstr "Отклонять исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-"Не устанавливать дополнительные правила для отклонения перенаправляемого трафика с "
-"состоянием <em>недействительный</em> (<em>invalid</em>). Это может потребоваться для "
-"сложных настроек асимметричной маршрутизации."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписывать"
+"Не устанавливать дополнительные правила для отклонения перенаправляемого "
+"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
+"потребоваться для сложных настроек асимметричной маршрутизации."
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -228,66 +209,60 @@ msgstr "Не отслеживать входящий трафик"
msgid "Do not track output"
msgstr "Не отслеживать исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Отбрасывать некорректные пакеты"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Включить"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Включить NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Включить защиту от SYN-flood атак"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Включить журналирование в этой зоне"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-"Явно определяет допустимые варианты помощников (helpers) отслеживания соединений "
-"(connection tracking) трафика в зоне."
+"Явно определяет допустимые варианты помощников (helpers) отслеживания "
+"соединений (connection tracking) трафика в зоне."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Внешний IP-адрес"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Внешний порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Внешняя зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Дополнительные аргументы"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Дополнительные аргументы для назначения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "Дополнительные аргументы iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Дополнительные аргументы для источника"
@@ -299,32 +274,32 @@ msgstr "Межсетевой экран"
msgid "Firewall - Custom Rules"
msgstr "Межсетевой экран - Пользовательские правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Межсетевой экран - Перенаправление портов"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Межсетевой экран - Правила для трафика"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Межсетевой экран - Настройка зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Принудительно включать отслеживание соединений"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Перенаправление"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Перенаправлять на"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Пятница"
@@ -355,15 +330,15 @@ msgstr "Из %s в <var>это устройство</var> с источнико
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Из %s в <var>это устройство</var> с источниками %s and %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Основные настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Аппаратный flow offloading"
@@ -387,13 +362,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 и IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Только IPv4"
@@ -401,32 +376,29 @@ msgstr "Только IPv4"
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Только IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Внутренний IP-адрес"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Внутренний порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Внутренняя зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ограничить журнал сообщений"
@@ -440,24 +412,24 @@ msgstr "MAC-адрес"
msgid "MACs"
msgstr "MAC-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ограничение MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Маскарадинг"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Соответствовать ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -465,22 +437,18 @@ msgstr ""
"Порт или диапазон портов, входящие подключения на который будут "
"перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Понедельник"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Дни месяца"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Имя"
@@ -488,44 +456,22 @@ msgstr "Имя"
msgid "Network"
msgstr "Сеть"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Новое правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Новое правило перенаправления"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Новое правило для входящего трафика"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Новое перенаправление порта"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новый SNAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
"Применять правило только для входящих подключений на указанный IP-адрес"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Применять правило только для входящего трафика от этих MAC-адресов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"Применять правило только для входящего трафика от этого IP-адреса или "
"диапазона адресов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -533,28 +479,19 @@ msgstr ""
"Применять правило только для входящего трафика от указанного порта или "
"диапазона портов клиентского хоста"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Открыть порты на маршрутизаторе"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Другое..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передаёт дополнительные аргументы таблице iptables. Используйте с "
"осторожностью!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -562,18 +499,18 @@ msgid ""
"invalid values could render the firewall ruleset broken, completely exposing "
"all services."
msgstr ""
-"Передача аргументов iptables в правилах классификации входящего и исходящего трафика "
-"позволяет сопоставлять пакеты, основанные на других критериях, нежели чем интерфейсы "
-"или подсети. Эти опции следует использовать с особой осторожностью, так как неверные "
-"значения могут привести к нарушению работы правил межсетевого экрана, полностью "
-"открывая доступ ко всем службам системы."
+"Передача аргументов iptables в правилах классификации входящего и исходящего "
+"трафика позволяет сопоставлять пакеты, основанные на других критериях, "
+"нежели чем интерфейсы или подсети. Эти опции следует использовать с особой "
+"осторожностью, так как неверные значения могут привести к нарушению работы "
+"правил межсетевого экрана, полностью открывая доступ ко всем службам системы."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Перенаправление портов"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -581,7 +518,7 @@ msgstr ""
"Перенаправленные портов позволяет удалённым компьютерам из Интернета "
"соединяться с компьютером или службой внутри частной локальной сети."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -589,21 +526,19 @@ msgstr ""
"Предотвратить установку <em>NOTRACK</em> правил, которые позволяют обходить "
"отслеживание соединений (connection tracking)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Перенаправлять трафик на указанный порт или диапазон портов внутреннего IP-"
"адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Перенаправлять трафик на указанный IP-адрес"
@@ -622,7 +557,7 @@ msgstr "Сбрасывать входящий трафик"
msgid "Refuse output"
msgstr "Сбрасывать исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621"
@@ -631,20 +566,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Перезапустить межсетевой экран"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Использовать протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Маршрутизация/NAT offloading"
@@ -656,71 +591,69 @@ msgstr "Правило отключено"
msgid "Rule is enabled"
msgstr "Правило включено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Суббота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Программная реализация offloading для маршрутизации/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Программный flow offloading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "IP-адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "MAC-адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Порт источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Зона источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата начала (год-мес-день)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "Время начала (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата окончания (год-мес-день)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "Время окончания (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Воскресенье"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -737,7 +670,7 @@ msgstr ""
"перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
"из wan в lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -752,15 +685,15 @@ msgstr ""
"различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие "
"доступные сети являются членами этой зоны."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Четверг"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "Временные ограничения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Время UTC"
@@ -780,20 +713,12 @@ msgstr "К %s на <var>этом устройстве</var>"
msgid "To %s, %s in %s"
msgstr "К %s, %s в %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "К IP-адресу источника"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "К порту источника"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Правила для трафика"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -803,25 +728,25 @@ msgstr ""
"зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
"портов маршрутизатора."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Вторник"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Перенаправление без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Правило без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -829,13 +754,13 @@ msgstr ""
"Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
"управляемым не через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
msgstr ""
-"Используйте эту опцию для классификации трафика зоны по источнику или подсети "
-"назначения вместо сети или устройств."
+"Используйте эту опцию для классификации трафика зоны по источнику или "
+"подсети назначения вместо сети или устройств."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
msgid "Via %s"
@@ -845,44 +770,44 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s, %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Среда"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Дни недели"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Перенаправления"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Зоны"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "принимать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "любой"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -896,7 +821,7 @@ msgstr "любой IP-адрес маршрутизатора"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "любой зоны"
@@ -906,13 +831,13 @@ msgstr "любой зоны"
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "не отслеживать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "не обрабатывать"
@@ -943,9 +868,9 @@ msgstr "порт"
msgid "ports"
msgstr "порты"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "отвергать"
@@ -954,6 +879,12 @@ msgstr "отвергать"
msgid "second"
msgstr "секунда"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -964,5 +895,44 @@ msgstr "тип"
msgid "types"
msgstr "типы"
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Добавить и редактировать..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Не перезаписывать"
+
+#~ msgid "External zone"
+#~ msgstr "Внешняя зона"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Новое правило SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Новое правило перенаправления"
+
+#~ msgid "New input rule"
+#~ msgstr "Новое правило для входящего трафика"
+
+#~ msgid "New port forward"
+#~ msgstr "Новое перенаправление порта"
+
+#~ msgid "New source NAT"
+#~ msgstr "Новый SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Открыть порты на маршрутизаторе"
+
+#~ msgid "Other..."
+#~ msgstr "Другое..."
+
+#~ msgid "To source IP"
+#~ msgstr "К IP-адресу источника"
+
+#~ msgid "To source port"
+#~ msgstr "К порту источника"
+
#~ msgid "Output zone"
#~ msgstr "Исходящая зона"
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index 9cc480774..40ea67f27 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -50,89 +50,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -147,17 +135,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -275,32 +250,32 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -331,15 +306,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -363,13 +338,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -377,32 +352,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,45 +388,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,66 +430,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -578,7 +513,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -586,20 +521,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -611,71 +546,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -722,51 +655,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -878,9 +803,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index b36b4cda1..d885c0398 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -9,7 +9,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s i %s"
@@ -18,7 +18,7 @@ msgstr "%s i %s"
msgid "%s%s with %s"
msgstr "%s%s med %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%2, %s i %s"
@@ -51,89 +51,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Åtgärd"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Lägg till"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Lägg till och redigera..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Avancerade inställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Alla"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Nätverk som omfattas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -148,17 +136,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Destinationens adress"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Destinationsport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Destinationens zon"
@@ -181,17 +167,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Skriv inte om igen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -207,64 +188,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Släpp ogiltiga paket"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktivera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktivera loggning i den här zonen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Extern IP-adress"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Extern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Extern zon"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Extra argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -276,32 +251,32 @@ msgstr "Brandvägg"
msgid "Firewall - Custom Rules"
msgstr "Brandvägg - Anpassade regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Brandvägg - Vidarebefordring av port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Brandvägg - Trafikregler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Brandvägg - Zoninställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Vidarebefordra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "Vidarebefordra till"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "Fredag"
@@ -332,15 +307,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Generella inställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -364,13 +339,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 och IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Endast IPv4"
@@ -378,32 +353,29 @@ msgstr "Endast IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Endast IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inmatning"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Intern IP-adress"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Intern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Intern zon"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begränsa loggmeddelanden"
@@ -417,24 +389,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskering"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Matcha"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Matchar ICMP-typ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -442,22 +414,18 @@ msgstr ""
"Matcha inkommande trafik dirigerad till den angivna destinationsporten eller "
"portens räckvidd på den här värden"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Måndag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Dagar i månaden"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Namn"
@@ -465,67 +433,36 @@ msgstr "Namn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT-regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny regel för vidarebefordring"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inmatningsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny vidarebefordring av port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny käll-NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"Matcha endast inkommande trafik från den här IP-adressen eller räckvidden."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Öppna portar i router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andra..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utmatning"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -534,36 +471,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Vidarebefordringar av port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -582,7 +517,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -590,20 +525,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Starta om brandvägg"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Begränsa till adressfamilj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -615,71 +550,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Lördag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "IP-adress för källa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "MAC-adress för källa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (åååå-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Stopptid (åååå-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Söndag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -698,15 +631,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Torsdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Tid enligt UTC"
@@ -726,51 +659,43 @@ msgstr "Till %s på <var>den här enheten</var>"
msgid "To %s, %s in %s"
msgstr "Till %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Trafikregler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Tisdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -784,44 +709,44 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Onsdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Veckodagar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zoner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "acceptera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "alla"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -835,7 +760,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "alla zoner"
@@ -845,13 +770,13 @@ msgstr "alla zoner"
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "spåra inte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "släpp"
@@ -882,9 +807,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "neka"
@@ -893,6 +818,12 @@ msgstr "neka"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,39 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Lägg till och redigera..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Skriv inte om igen"
+
+#~ msgid "External zone"
+#~ msgstr "Extern zon"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT-regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny regel för vidarebefordring"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inmatningsregel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny vidarebefordring av port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny käll-NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Öppna portar i router"
+
+#~ msgid "Other..."
+#~ msgstr "Andra..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Namnlös post)"
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index d645720a7..492d8aa8e 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -43,89 +43,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -140,17 +128,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -173,17 +159,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -199,64 +180,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -268,32 +243,32 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -324,15 +299,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -356,13 +331,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -370,32 +345,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -409,45 +381,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -455,66 +423,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -523,36 +460,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -571,7 +506,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -579,20 +514,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -604,71 +539,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -678,7 +611,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -687,15 +620,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -715,51 +648,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -773,44 +698,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -824,7 +749,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -834,13 +759,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -871,9 +796,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -882,6 +807,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 5dc20d7ac..111330637 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -50,89 +50,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -147,17 +135,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -275,32 +250,32 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -331,15 +306,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -363,13 +338,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -377,32 +352,29 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,45 +388,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,66 +430,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -578,7 +513,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -586,20 +521,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -611,71 +546,69 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -722,51 +655,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -878,9 +803,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 17810618e..8dd0b5a0a 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"PO-Revision-Date: 2019-07-30 02:30+0300\n"
+"PO-Revision-Date: 2019-09-21 22:10+0300\n"
"Last-Translator: Yurii <yuripet@gmail.com>\n"
"Language-Team: none\n"
"Language: uk\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s у %s"
@@ -18,7 +18,7 @@ msgstr "%s у %s"
msgid "%s%s with %s"
msgstr "%s%s із %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s у %s"
@@ -51,102 +51,90 @@ msgstr "Приймати вхідний"
msgid "Accept output"
msgstr "Приймати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Дія"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Додати"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Додати та редагувати..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб "
-"зіставляти лише вихідний трафік HTTPS."
+"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
+"лише вихідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"джерела зони, наприклад, <code>-p tcp --sport 443</code>, щоб "
-"зіставляти лише вхідний трафік HTTPS."
+"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку джерела "
+"зони, наприклад, <code>-p tcp --sport 443</code>, щоб зіставляти лише "
+"вхідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Розширені настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Дозволити \"неправильний\" трафік"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Будь-який"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "Будь-який день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматичне призначення помічника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-"Автоматично призначати помічників відслідковування з'єднань (<abbr "
-"title=\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та "
-"порту трафіку"
+"Автоматично призначати помічників відслідковування з'єднань (<abbr title="
+"\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та порту "
+"трафіку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">""
-"Conntrack</abbr>)"
+"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охоплені пристрої"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охоплені мережі"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охоплені підмережі"
@@ -165,17 +153,15 @@ msgstr ""
"виконуються після кожного перезавантаження брандмауера, відразу після "
"завантаження типового набору правил."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Адреса призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Порт призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Зона призначення"
@@ -198,19 +184,14 @@ msgstr "Відкидати вхідний"
msgid "Discard output"
msgstr "Відкидати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-"Не встановлювати додаткові правила для відхилення переспрямованого трафіку зі "
-"станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися для "
-"складних налаштувань асиметричного маршруту."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписувати"
+"Не встановлювати додаткові правила для відхилення переспрямованого трафіку "
+"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
+"для складних налаштувань асиметричного маршруту."
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -227,64 +208,60 @@ msgstr "Не відслідковувати вхідний"
msgid "Do not track output"
msgstr "Не відслідковувати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Відкидати помилкові пакети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Увімкнути"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Увімкнути NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Увімкнути захист від SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Увімкнути реєстрування у цій зоні"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "В явному вигляді дозволені помічники відслідковування з'єднань для трафіку зони"
+msgstr ""
+"В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
+"зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Зовнішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Зовнішній порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Зовнішня зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Додаткові аргументи"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Додаткові аргументи для призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "Додаткові аргументи iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Додаткові аргументи для джерела"
@@ -296,32 +273,32 @@ msgstr "Брандмауер"
msgid "Firewall - Custom Rules"
msgstr "Брандмауер — Настроювані правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Брандмауер — Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Брандмауер — Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Брандмауер — Параметри зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Примусове відслідковування з'єднань"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "переспрямовування до"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "П'ятниця"
@@ -352,15 +329,15 @@ msgstr "Від %s на <var>цьому пристрої</var> з джерело
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s та %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Загальні параметри"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Апаратні засоби розвантаження потоку"
@@ -384,13 +361,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 та IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Лише IPv4"
@@ -398,32 +375,29 @@ msgstr "Лише IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Лише IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Внутрішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Внутрішній порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Внутрішня зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Обмеження повідомлень журналу"
@@ -437,24 +411,24 @@ msgstr "MAC-адреса"
msgid "MACs"
msgstr "MAC-адреси"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Затискання MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Підміна"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Зіставляти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Зіставляти ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -462,22 +436,18 @@ msgstr ""
"Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
"діапазон портів цього вузла."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Понеділок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Дні місяця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Ім'я"
@@ -485,41 +455,19 @@ msgstr "Ім'я"
msgid "Network"
msgstr "Мережа"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Нове правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Нове правило переспрямовування"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Нове вхідне правило"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Нове переспрямовування порту"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новий NAT джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -527,27 +475,18 @@ msgstr ""
"Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
"діапазоні портів вузла клієнта."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Відкрити порти на роутері"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Інше..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,17 +495,17 @@ msgid ""
"all services."
msgstr ""
"Передавання аргументів raw iptables до правил класифікації вихідного трафіку "
-"та трафіку призначення дозволяє зіставляти пакети на підставі інших критеріїв, "
-"ніж інтерфейси чи підмережі. Ці параметри слід використовувати з особливою "
-"обережністю, оскільки невірні значення можуть призвести до порушення набору "
-"правил брандмауера, повністю відкриваючи всі служби."
+"та трафіку призначення дозволяє зіставляти пакети на підставі інших "
+"критеріїв, ніж інтерфейси чи підмережі. Ці параметри слід використовувати з "
+"особливою обережністю, оскільки невірні значення можуть призвести до "
+"порушення набору правил брандмауера, повністю відкриваючи всі служби."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -574,7 +513,7 @@ msgstr ""
"Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
"підключатися до певного комп'ютера або служби у приватній мережі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -582,20 +521,18 @@ msgstr ""
"Запобігати встановленню правил NOTRACK, які могли б обійти відслідковування "
"з'єднань."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
@@ -614,7 +551,7 @@ msgstr "Відхиляти вхідний"
msgid "Refuse output"
msgstr "Відхиляти вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
@@ -622,20 +559,20 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
msgid "Restart Firewall"
msgstr "Перезавантажити брандмауер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Обмежити підміну заданими підмережами призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Обмежити підміну заданими підмережами джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Обмежити сімейство протоколів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Розвантаження маршрутизації/NAT"
@@ -647,64 +584,62 @@ msgstr "Правило вимкнено"
msgid "Rule is enabled"
msgstr "Правило ввімкнено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Субота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Програмне розвантаження для маршрутизації/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Програмне розвантаження потоку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "IP-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "MAC-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Порт джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Зона джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата початку (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "Час початку (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата зупинки (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "Час зупинки (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Неділя"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -712,8 +647,8 @@ msgstr ""
"Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
"потоком мережевого трафіку."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +665,7 @@ msgstr ""
"від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
"до LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -744,15 +679,15 @@ msgstr ""
"трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
"визначає, які доступні мережі є членами цієї зони."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Четвер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "Часові обмеження"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Час в UTC"
@@ -772,20 +707,12 @@ msgstr "%s на <var>цього пристрою</var>"
msgid "To %s, %s in %s"
msgstr "%s, %s у %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "До IP джерела"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "До порту джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -795,25 +722,25 @@ msgstr ""
"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
"порти WAN на маршрутизаторі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Вівторок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Переспрямовування без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Правило без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -821,7 +748,7 @@ msgstr ""
"Використовуйте цей параметр для класифікації трафіку зон за мережевими "
"пристроями <em>raw</em>, які не управляються через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -837,44 +764,44 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s на %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Середа"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Дні тижня"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "приймати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "будь-який"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -888,7 +815,7 @@ msgstr "будь-який IP роутера"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "будь-якій зоні"
@@ -898,13 +825,13 @@ msgstr "будь-якій зоні"
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "не відстеж."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "опускати"
@@ -935,9 +862,9 @@ msgstr "порт"
msgid "ports"
msgstr "порти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "відкидати"
@@ -946,6 +873,12 @@ msgstr "відкидати"
msgid "second"
msgstr "секунду"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "ця нова зона"
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 7e0d12639..31868bac6 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Pootle 1.1.0\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr ""
@@ -55,89 +55,77 @@ msgstr ""
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -152,17 +140,15 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Địa chỉ điểm đến"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Cổng điểm đến"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
#, fuzzy
msgid "Destination zone"
msgstr "Điểm đến"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -212,65 +193,59 @@ msgstr ""
msgid "Do not track output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Bỏ qua nhưng gói không hợp lý"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
#, fuzzy
msgid "Enable SYN-flood protection"
msgstr "SYN-flood bảo vệ "
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -282,32 +257,32 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr ""
@@ -338,15 +313,15 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr ""
@@ -370,13 +345,13 @@ msgid "IPv4"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -384,34 +359,31 @@ msgstr ""
msgid "IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
#, fuzzy
msgid "Internal IP address"
msgstr "Internal address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
#, fuzzy
msgid "Internal port"
msgstr "External port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -425,46 +397,42 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS Clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -472,66 +440,35 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -540,36 +477,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
@@ -588,7 +523,7 @@ msgstr ""
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -596,20 +531,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr ""
@@ -621,67 +556,65 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
#, fuzzy
msgid "Source IP address"
msgstr "Đỉa chỉ MAC nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
#, fuzzy
msgid "Source address"
msgstr "Đỉa chỉ MAC nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Cổng nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
#, fuzzy
msgid "Source zone"
msgstr "Cổng nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -689,8 +622,8 @@ msgstr ""
"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
"thông của mạng."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -709,15 +642,15 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr ""
@@ -737,51 +670,43 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "chấp nhận"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -846,7 +771,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
@@ -856,13 +781,13 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -893,9 +818,9 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Không chấp nhận"
@@ -904,6 +829,12 @@ msgstr "Không chấp nhận"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 13e4f0aee..28cd88b5c 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
"PO-Revision-Date: 2018-08-08 08:28+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s 位于 %s"
@@ -20,7 +20,7 @@ msgstr "%s 位于 %s"
msgid "%s%s with %s"
msgstr "%s%s 和 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s 位于 %s"
@@ -53,89 +53,77 @@ msgstr "接受入站"
msgid "Accept output"
msgstr "接受出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "动作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "添加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "添加并编辑…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "高级设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允许从<em>源区域</em>转发:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允许转发到<em>目标区域</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "任何"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆盖网络"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -152,17 +140,15 @@ msgstr ""
"自定义规则允许您执行不属于防火墙框架的任意 iptables 命令。每次重启防火墙时,"
"在默认的规则运行后这些命令将立即执行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "目标地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "目标端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "目标区域"
@@ -185,17 +171,12 @@ msgstr "丢弃入站"
msgid "Discard output"
msgstr "丢弃出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重写"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr "不跟踪入站"
msgid "Do not track output"
msgstr "不跟踪出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "丢弃无效数据包"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "启用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "启用 NAT 环回"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "启用 SYN-flood 防御"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "启用此区域的日志记录"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "实验特性。与 QoS/SQM 不完全兼容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "外部 IP 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "外部端口"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部区域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加参数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -280,32 +255,32 @@ msgstr "防火墙"
msgid "Firewall - Custom Rules"
msgstr "防火墙 - 自定义规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "防火墙 - 端口转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "防火墙 - 通信规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "防火墙 - 区域设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "强制连接追踪"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "转发到"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "星期五"
@@ -336,15 +311,15 @@ msgstr "来自 %s 位于<var>本设备</var>源于 %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "来自 %s 位于<var>本设备</var>源端口 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "基本设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "硬件流量分载"
@@ -368,13 +343,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "仅 IPv4"
@@ -382,32 +357,29 @@ msgstr "仅 IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "仅 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站数据"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "内部 IP 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "内部端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "内部区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日志信息"
@@ -421,45 +393,41 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 钳制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 动态伪装"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "匹配规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "匹配 ICMP 类型"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr "匹配指向此主机上指定目标端口或目标端口范围的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,66 +435,35 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建转发规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建进入规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建端口转发"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "仅匹配指定目的 IP 地址的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "仅匹配来自这些 MAC 的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "仅匹配来自此 IP 或 IP 范围的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "打开路由器端口"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站数据"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables 的额外参数。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -535,37 +472,35 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "端口转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr ""
"端口转发允许 Internet 上的远程计算机连接到内部网络中的特定计算机或服务。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "协议"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr "重定向匹配的入站流量到内部主机的端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "重定向匹配的入站流量到指定的内部主机"
@@ -584,7 +519,7 @@ msgstr "拒绝入站"
msgid "Refuse output"
msgstr "拒绝出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
@@ -592,20 +527,20 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
msgid "Restart Firewall"
msgstr "重启防火墙"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 动态伪装的目标子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 动态伪装的源子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "限制地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分载"
@@ -617,71 +552,69 @@ msgstr "规则已禁用"
msgid "Rule is enabled"
msgstr "规则已启用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "星期六"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "基于软件的 Routing/NAT 分载"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "软件流量分载"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "源 IP 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "源 MAC 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "源地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "源端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "源区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "开始日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "星期日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -695,7 +628,7 @@ msgstr ""
"strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的,例如:一条允许"
"从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -707,15 +640,15 @@ msgstr ""
"域入站和出站流量的默认策略,<em>转发</em>选项描述该区域内不同网络之间的流量转"
"发策略。<em>覆盖网络</em>指定从属于这个区域的网络。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "星期四"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "UTC 时间"
@@ -735,20 +668,12 @@ msgstr "到 %s 位于<var>本设备</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位于 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源端口"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "通信规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -757,31 +682,31 @@ msgstr ""
"通信规则定义了不同区域间的数据包传输策略,例如:拒绝一些主机之间的通信,开放"
"路由器 WAN 上的端口。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "星期二"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "未命名转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "未命名规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr "通过 %s"
msgid "Via %s at %s"
msgstr "通过 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "区域 ⇒ 转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "所有"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -846,7 +771,7 @@ msgstr "所有路由 IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "所有区域"
@@ -856,13 +781,13 @@ msgstr "所有区域"
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "不跟踪"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丢弃"
@@ -893,9 +818,9 @@ msgstr "端口"
msgid "ports"
msgstr "端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒绝"
@@ -904,6 +829,12 @@ msgstr "拒绝"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,6 +845,45 @@ msgstr "类型"
msgid "types"
msgstr "类型"
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "添加并编辑…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重写"
+
+#~ msgid "External zone"
+#~ msgstr "外部区域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 规则"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建转发规则"
+
+#~ msgid "New input rule"
+#~ msgstr "新建进入规则"
+
+#~ msgid "New port forward"
+#~ msgstr "新建端口转发"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "打开路由器端口"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源端口"
+
#~ msgid "Output zone"
#~ msgstr "出站区域"
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 1e236c78a..9754bc7a5 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
"PO-Revision-Date: 2018-08-08 08:28+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s 位於 %s"
@@ -20,7 +20,7 @@ msgstr "%s 位於 %s"
msgid "%s%s with %s"
msgstr "%s%s 和 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s 位於 %s"
@@ -53,89 +53,77 @@ msgstr "接受入站"
msgid "Accept output"
msgstr "接受出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "新增"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "新增並編輯…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "高階設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允許從<em>源區域</em>轉發:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允許轉發到<em>目標區域</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "任何"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆蓋網路"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -152,17 +140,15 @@ msgstr ""
"自訂規則允許您執行不屬於防火牆框架的任意 iptables 指令。每次重啟防火牆時,在"
"預設的規則執行後這些指令將立即執行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "目標位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "目標埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "目標區域"
@@ -185,17 +171,12 @@ msgstr "丟棄入站"
msgid "Discard output"
msgstr "丟棄出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重寫"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr "不跟蹤入站"
msgid "Do not track output"
msgstr "不跟蹤出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "丟棄無效資料包"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "啟用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "啟用 NAT 環回"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "啟用 SYN-flood 防禦"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "啟用此區域的日誌記錄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "實驗特性。與 QoS/SQM 不完全相容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "外部 IP 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "外部埠"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部區域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加引數"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -280,32 +255,32 @@ msgstr "防火牆"
msgid "Firewall - Custom Rules"
msgstr "防火牆 - 自訂規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "防火牆 - 埠轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "防火牆 - 通訊規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "防火牆 - 區域設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制連線追蹤"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "轉發到"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "星期五"
@@ -336,15 +311,15 @@ msgstr "來自 %s 位於<var>本裝置</var>源於 %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "來自 %s 位於<var>本裝置</var>源埠 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "基本設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "硬體流量分載"
@@ -368,13 +343,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "僅 IPv4"
@@ -382,32 +357,29 @@ msgstr "僅 IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "僅 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站資料"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "內部 IP 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "內部埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "內部區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日誌資訊"
@@ -421,45 +393,41 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 鉗制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 動態偽裝"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "匹配規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "匹配 ICMP 型別"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr "匹配指向此主機上指定目標埠或目標埠範圍的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,66 +435,35 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建轉發規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建進入規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建埠轉發"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "僅匹配指定目的 IP 位址的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "僅匹配來自這些 MAC 的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "僅匹配來自此 IP 或 IP 範圍的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "開啟路由器埠"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站資料"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳遞到 iptables 的額外引數。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -535,36 +472,34 @@ msgid ""
"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "埠轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中的特定計算機或服務。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "協議"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr "重定向匹配的入站流量到內部主機的埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "重定向匹配的入站流量到指定的內部主機"
@@ -583,7 +518,7 @@ msgstr "拒絕入站"
msgid "Refuse output"
msgstr "拒絕出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
@@ -591,20 +526,20 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
msgid "Restart Firewall"
msgstr "重啟防火牆"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 動態偽裝的目標子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 動態偽裝的源子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "限制位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分載"
@@ -616,71 +551,69 @@ msgstr "規則已禁用"
msgid "Rule is enabled"
msgstr "規則已啟用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "星期六"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "基於軟體的 Routing/NAT 分載"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "軟體流量分載"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "源 IP 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "源 MAC 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "源位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "源埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "源區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "星期日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr "防火牆通過在網路介面上建立區域來控制網路流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -694,7 +627,7 @@ msgstr ""
"strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的,例如:一條允許"
"從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -706,15 +639,15 @@ msgstr ""
"域入站和出站流量的預設策略,<em>轉發</em>選項描述該區域內不同網路之間的流量轉"
"發策略。<em>覆蓋網路</em>指定從屬於這個區域的網路。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "星期四"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "UTC 時間"
@@ -734,20 +667,12 @@ msgstr "到 %s 位於<var>本裝置</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位於 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源埠"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "通訊規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -756,31 +681,31 @@ msgstr ""
"通訊規則定義了不同區域間的資料包傳輸策略,例如:拒絕一些主機之間的通訊,開放"
"路由器 WAN 上的埠。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "星期二"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "未命名轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "未命名規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -794,44 +719,44 @@ msgstr "通過 %s"
msgid "Via %s at %s"
msgstr "通過 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "區域 ⇒ 轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "所有"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -845,7 +770,7 @@ msgstr "所有路由 IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "所有區域"
@@ -855,13 +780,13 @@ msgstr "所有區域"
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "不跟蹤"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丟棄"
@@ -892,9 +817,9 @@ msgstr "埠"
msgid "ports"
msgstr "埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒絕"
@@ -903,6 +828,12 @@ msgstr "拒絕"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -913,6 +844,45 @@ msgstr "型別"
msgid "types"
msgstr "型別"
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Add and edit..."
+#~ msgstr "新增並編輯…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重寫"
+
+#~ msgid "External zone"
+#~ msgstr "外部區域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 規則"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建轉發規則"
+
+#~ msgid "New input rule"
+#~ msgstr "新建進入規則"
+
+#~ msgid "New port forward"
+#~ msgstr "新建埠轉發"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "開啟路由器埠"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源埠"
+
#~ msgid "Output zone"
#~ msgstr "出站區域"
diff --git a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
index 23f0cf4b4..7df9dac84 100644
--- a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:33-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -130,11 +130,13 @@ msgstr "Control led"
#: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
msgid "Link newest picture to fixed file name"
-msgstr ""
+msgstr "Vincula la imagen más reciente al nombre de archivo fijo"
#: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
msgid "Link the last picture in ringbuffer to fixed named file provided."
msgstr ""
+"Enlace la última imagen en ringbuffer a un archivo con nombre fijo "
+"proporcionado."
#: applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua:12
msgid "MJPG-streamer"
diff --git a/applications/luci-app-mwan3/po/es/mwan3.po b/applications/luci-app-mwan3/po/es/mwan3.po
index 2592a2f68..014a271da 100644
--- a/applications/luci-app-mwan3/po/es/mwan3.po
+++ b/applications/luci-app-mwan3/po/es/mwan3.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:36-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -778,7 +778,7 @@ msgstr "Intervalo de actualización"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:37
msgid "View the content of /etc/protocols for protocol description"
-msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo."
+msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:19
msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!"
@@ -854,7 +854,7 @@ msgstr "agujero negro (caída)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:241
msgid "connected (mwan3)"
-msgstr ""
+msgstr "conectado (mwan3)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:82
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:30
@@ -864,15 +864,15 @@ msgstr "predeterminado (usar tabla de enrutamiento principal)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:242
msgid "disconnected (mwan3)"
-msgstr ""
+msgstr "desconectado (mwan3)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:240
msgid "ifdown (netifd)"
-msgstr ""
+msgstr "Interfaz abajo (netifd)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:239
msgid "ifup (netifd)"
-msgstr ""
+msgstr "Interfaz arriba (netifd)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:84
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
diff --git a/applications/luci-app-ntpc/po/es/ntpc.po b/applications/luci-app-ntpc/po/es/ntpc.po
index bfeeac6e1..f953d8e2a 100644
--- a/applications/luci-app-ntpc/po/es/ntpc.po
+++ b/applications/luci-app-ntpc/po/es/ntpc.po
@@ -1,21 +1,21 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-11-25 11:14+0200\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2019-09-17 23:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.2.3\n"
+"Language-Team: \n"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
msgid "Clock Adjustment"
-msgstr "Ajuste del Reloj"
+msgstr "Configuración del reloj"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:17
msgid "Count of time measurements"
@@ -34,7 +34,7 @@ msgstr "General"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:34
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:23
msgid "Hostname"
-msgstr "Nombre de la máquina"
+msgstr "Nombre de host"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:25
msgid "Offset frequency"
diff --git a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
index 79c6ddb78..f41b48103 100644
--- a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
+++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
@@ -10,24 +10,24 @@ function index()
local page
- page = entry({"admin", "services", "ocserv"}, alias("admin", "services", "ocserv", "main"),
+ page = entry({"admin", "vpn", "ocserv"}, alias("admin", "vpn", "ocserv", "main"),
_("OpenConnect VPN"))
page.dependent = true
- page = entry({"admin", "services", "ocserv", "main"},
+ page = entry({"admin", "vpn", "ocserv", "main"},
cbi("ocserv/main"),
_("Server Settings"), 200)
page.dependent = true
- page = entry({"admin", "services", "ocserv", "users"},
+ page = entry({"admin", "vpn", "ocserv", "users"},
cbi("ocserv/users"),
_("User Settings"), 300)
page.dependent = true
- entry({"admin", "services", "ocserv", "status"},
+ entry({"admin", "vpn", "ocserv", "status"},
call("ocserv_status")).leaf = true
- entry({"admin", "services", "ocserv", "disconnect"},
+ entry({"admin", "vpn", "ocserv", "disconnect"},
post("ocserv_disconnect")).leaf = true
end
diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
index 9c69514b9..d00084a0b 100644
--- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
+++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
@@ -1,7 +1,7 @@
<script type="text/javascript">//<![CDATA[
function ocserv_disconnect(idx) {
- (new XHR()).post('<%=url('admin/services/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
+ (new XHR()).post('<%=url('admin/vpn/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
function(x)
{
var tb = document.getElementById('ocserv_status_table');
@@ -11,7 +11,7 @@
);
}
- XHR.poll(-1, '<%=url('admin/services/ocserv/status')%>', null,
+ XHR.poll(-1, '<%=url('admin/vpn/ocserv/status')%>', null,
function(x, st)
{
var tb = document.getElementById('ocserv_status_table');
diff --git a/applications/luci-app-olsr-services/po/es/olsr-services.po b/applications/luci-app-olsr-services/po/es/olsr-services.po
index 31ed81167..81da4d875 100644
--- a/applications/luci-app-olsr-services/po/es/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/es/olsr-services.po
@@ -21,8 +21,8 @@ msgid ""
"No services can be shown, because olsrd is not running or the olsrd-"
"nameservice Plugin is not loaded."
msgstr ""
-"No se pueden mostrar servicios, porque olsrd no se está ejecutando "
-"o el complemento olsrd-nameservice no está cargado."
+"No se pueden mostrar servicios, porque olsrd no se está ejecutando o el "
+"complemento olsrd-nameservice no está cargado."
#: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
#: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index c9a932d87..55c29d1c2 100644
--- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
@@ -5,11 +5,11 @@
module("luci.controller.openvpn", package.seeall)
function index()
- entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
- entry( {"admin", "services", "openvpn", "basic"}, cbi("openvpn-basic"), nil ).leaf = true
- entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
- entry( {"admin", "services", "openvpn", "file"}, form("openvpn-file"), nil ).leaf = true
- entry( {"admin", "services", "openvpn", "upload"}, call("ovpn_upload"))
+ entry( {"admin", "vpn", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
+ entry( {"admin", "vpn", "openvpn", "basic"}, cbi("openvpn-basic"), nil ).leaf = true
+ entry( {"admin", "vpn", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
+ entry( {"admin", "vpn", "openvpn", "file"}, form("openvpn-file"), nil ).leaf = true
+ entry( {"admin", "vpn", "openvpn", "upload"}, call("ovpn_upload"))
end
function ovpn_upload()
@@ -50,5 +50,5 @@ function ovpn_upload()
end
end
end
- http.redirect(luci.dispatcher.build_url('admin/services/openvpn'))
+ http.redirect(luci.dispatcher.build_url('admin/vpn/openvpn'))
end
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index 2bf36cb27..1971400b8 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -676,13 +676,37 @@ local knownParams = {
"key_method",
{ 1, 2 },
translate("Enable TLS and assume client role") },
- { Value,
+ { DynamicList,
"tls_cipher",
- "DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:RC4-SHA:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC4-MD5",
+ {
+ "DHE-RSA-AES256-SHA",
+ "DHE-DSS-AES256-SHA",
+ "AES256-SHA",
+ "EDH-RSA-DES-CBC3-SHA",
+ "EDH-DSS-DES-CBC3-SHA",
+ "DES-CBC3-SHA",
+ "DHE-RSA-AES128-SHA",
+ "DHE-DSS-AES128-SHA",
+ "AES128-SHA",
+ "RC4-SHA",
+ "RC4-MD5",
+ "EDH-RSA-DES-CBC-SHA",
+ "EDH-DSS-DES-CBC-SHA",
+ "DES-CBC-SHA",
+ "EXP-EDH-RSA-DES-CBC-SHA",
+ "EXP-EDH-DSS-DES-CBC-SHA",
+ "EXP-DES-CBC-SHA",
+ "EXP-RC2-CBC-MD5",
+ "EXP-RC4-MD5"
+ },
translate("TLS cipher") },
- { Value,
+ { DynamicList,
"tls_ciphersuites",
- "TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256",
+ {
+ "TLS_AES_256_GCM_SHA384",
+ "TLS_AES_128_GCM_SHA256",
+ "TLS_CHACHA20_POLY1305_SHA256"
+ },
translate("TLS 1.3 or newer cipher") },
{ Value,
"tls_timeout",
@@ -776,7 +800,7 @@ local cts = { }
local params = { }
local m = Map("openvpn")
-m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn")
+m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn")
m.apply_on_parse = true
local p = m:section( SimpleSection )
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 132c4d8f9..86a76d5c8 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -95,7 +95,7 @@ local basicParams = {
local m = Map("openvpn")
-m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn")
+m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn")
m.apply_on_parse = true
local p = m:section( SimpleSection )
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index 41266d860..9164f7f60 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
@@ -18,9 +18,9 @@ local cfg = s:option(DummyValue, "config")
function cfg.cfgvalue(self, section)
local file_cfg = self.map:get(section, "config")
if file_cfg then
- s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "file", "%s")
+ s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "file", "%s")
else
- s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "basic", "%s")
+ s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "basic", "%s")
end
end
@@ -117,7 +117,7 @@ end
local updown = s:option( Button, "_updown", translate("Start/Stop") )
updown._state = false
updown.redirect = luci.dispatcher.build_url(
- "admin", "services", "openvpn"
+ "admin", "vpn", "openvpn"
)
function updown.cbid(self, section)
local pid = s.getPID(section)
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
index e75bfda90..3e83df20a 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
@@ -54,7 +54,7 @@
if (form)
{
form.enctype = 'multipart/form-data';
- form.action = '<%=url('admin/services/openvpn/upload')%>';
+ form.action = '<%=url('admin/vpn/openvpn/upload')%>';
form.submit();
}
}
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index c1fe05215..7d88b844a 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -8,21 +8,21 @@
<div class="cbi-section">
<h3>
- <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> &#187;
+ <a href="<%=url('admin/vpn/openvpn')%>"><%:Overview%></a> &#187;
<%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
</h3>
<% if self.mode == "basic" then %>
- <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
+ <a href="<%=url('admin/vpn/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
<hr />
<% elseif self.mode == "advanced" then %>
- <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
+ <a href="<%=url('admin/vpn/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
<hr />
<%:Configuration category%>:
<% for i, c in ipairs(self.categories) do %>
<% if c == self.category then %>
<strong><%=translate(c)%></strong>
<% else %>
- <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
+ <a href="<%=luci.dispatcher.build_url("admin", "vpn", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
<% end %>
<% if next(self.categories, i) then %>|<% end %>
<% end %>
diff --git a/applications/luci-app-openvpn/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po
index f47a31036..73e04866a 100644
--- a/applications/luci-app-openvpn/po/ca/openvpn.po
+++ b/applications/luci-app-openvpn/po/ca/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Afegeix ruta després d'establir connexió"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Autenticació addicional sobre TLS"
@@ -51,7 +51,7 @@ msgstr "Permet tràfic client a client"
msgid "Allow multiple clients with same certificate"
msgstr "Permet múltiples clients amb el mateix certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Permet només una sessió"
@@ -108,7 +108,7 @@ msgstr "Canvia la prioritat del procés"
msgid "Change to directory before initialization"
msgstr "Canvia el directori abans de la inicialització"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Comprova el certificat de peer contra un CRL"
@@ -193,7 +193,7 @@ msgstr "No executis ifconfig"
msgid "Don't add routes automatically"
msgstr "No afegeixis rutes automàticament"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "No desis a la memòria cau contrasenyes --askpass o --auth-user-pass"
@@ -271,7 +271,7 @@ msgstr "Activa la interfície de gestió a <em>IP</em> <em>port</em>"
msgid "Enabled"
msgstr "Activat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -299,11 +299,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Surt en fallar la negociació TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Aconsegueix contrasenya PEM de controlar tty abans de dimonitzar"
@@ -347,7 +347,7 @@ msgstr "Mantingues l'adreça IP remota al reiniciar"
msgid "Keep tun/tap device open on restart"
msgstr "Mantingues el dispositiu tun/tap obert al reiniciar"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Finestra de transició de clau"
@@ -389,7 +389,7 @@ msgstr "Número de línies per historial de fitxer de registre"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Accepta connexions només d'un cert nom X509"
@@ -500,15 +500,15 @@ msgstr "Nom de màquina remot o adreça IP"
msgid "Remote ping timeout"
msgstr "Temps d'espera màxim de ping remot"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegocia clau de canal de dades després de bytes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renegocia clau de canal de dades després de paquets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Renegocia clau de canal de dades després de segons"
@@ -516,11 +516,11 @@ msgstr "Renegocia clau de canal de dades després de segons"
msgid "Replay protection sliding window size"
msgstr "Mida de la finestra lliscant de protecció de reproducció"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Requereix una designació explícita al certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Requereix ús de clau explícit al certificat"
@@ -528,11 +528,11 @@ msgstr "Requereix ús de clau explícit al certificat"
msgid "Restart after remote ping timeout"
msgstr "Reinicia després d'excedir el temps d'espera de ping remot"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Temps d'espera de retransmissió en canal de control TLS"
@@ -713,11 +713,11 @@ msgstr "Port TCP/UDP per local (defecte=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Port TCP/UDP per remot (defecte=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Xifrador TLS"
@@ -744,16 +744,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -763,11 +763,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Calendari per intercanvi de claus"
diff --git a/applications/luci-app-openvpn/po/cs/openvpn.po b/applications/luci-app-openvpn/po/cs/openvpn.po
index f4dc19908..b9a1dc81f 100644
--- a/applications/luci-app-openvpn/po/cs/openvpn.po
+++ b/applications/luci-app-openvpn/po/cs/openvpn.po
@@ -11,8 +11,8 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -36,7 +36,7 @@ msgstr "Přidat trasu po navázání spojení"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Dodatečné ověření přes TLS"
@@ -49,7 +49,7 @@ msgstr "Povolit provoz typu klient-klient"
msgid "Allow multiple clients with same certificate"
msgstr "Povolit více klientů se stejným certifikátem"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Povolit pouze jedno sezení"
@@ -103,7 +103,7 @@ msgstr "Změnit prioritu procesu"
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -188,7 +188,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -266,7 +266,7 @@ msgstr ""
msgid "Enabled"
msgstr "Povoleno"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -294,11 +294,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -342,7 +342,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -384,7 +384,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -495,15 +495,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -511,11 +511,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -523,11 +523,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -707,11 +707,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS šifra"
@@ -738,16 +738,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -757,11 +757,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/de/openvpn.po b/applications/luci-app-openvpn/po/de/openvpn.po
index 279b5d817..dc9ff8195 100644
--- a/applications/luci-app-openvpn/po/de/openvpn.po
+++ b/applications/luci-app-openvpn/po/de/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
msgid "Add template based configuration"
msgstr "Hinzufügen einer vorlagenbasierten Konfiguration"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Erweiterte Authentifikation über TLS"
@@ -51,7 +51,7 @@ msgstr "Netzwerkverkehr zwischen Teilnehmern zulassen"
msgid "Allow multiple clients with same certificate"
msgstr "Mehrere Teilnehmer mit selbem Zertifikat erlauben"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Nur eine einzige Verbindung zulassen"
@@ -106,7 +106,7 @@ msgstr "Prozess-Priorität anpassen"
msgid "Change to directory before initialization"
msgstr "<em>Vor</em> der Initialisierung in Verzeichnis wechseln"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Teilnehmerzertifikat mit Sperrliste abgleichen"
@@ -191,13 +191,14 @@ msgstr "Schnittstellenkonfiguration nicht durchführen"
msgid "Don't add routes automatically"
msgstr "Netzwerkrouten nicht automatisch einrichten"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Authentifikationsdaten nicht zwischenspeichern"
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:244
msgid "Don't drop incoming tun packets with same destination as host"
-msgstr "Eingehende Tun-Pakete mit dem gleichen Ziel wie der Host nicht verwerfen"
+msgstr ""
+"Eingehende Tun-Pakete mit dem gleichen Ziel wie der Host nicht verwerfen"
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:386
msgid "Don't inherit global push options"
@@ -269,9 +270,11 @@ msgstr "Administratorschnittstelle aktivieren"
msgid "Enabled"
msgstr "Einschalten"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
-msgstr "Verschlüsseln und authentifizieren aller Kontrollkanalpakete mit dem Schlüssel"
+msgstr ""
+"Verschlüsseln und authentifizieren aller Kontrollkanalpakete mit dem "
+"Schlüssel"
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:622
msgid "Encryption cipher for packets"
@@ -301,11 +304,11 @@ msgstr ""
"Wird im Servermodus ausgeführt, wann immer eine IPv4-Adresse/Route oder MAC-"
"Adresse zur internen Routingtabelle von OpenVPN hinzugefügt wird"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "PEM-Passwort von Konsole abfragen"
@@ -351,7 +354,7 @@ msgstr "IP-Adresse der Gegenstelle bei Neustarts beibehalten"
msgid "Keep tun/tap device open on restart"
msgstr "TUN/TAP Schnittelle bei Neustarts offen halten"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Maximaler Zeitraum für Schlüsselwechsel"
@@ -393,7 +396,7 @@ msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
msgid "OVPN configuration file upload"
msgstr "OVPN-Konfigurationsdatei hochladen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Nur Verbindungen vom angegebenem X.509 Name zulassen"
@@ -505,15 +508,15 @@ msgstr "Entfernter Rechnername oder IP-Adresse"
msgid "Remote ping timeout"
msgstr "Ping-Timeout für Gegenstellen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Schlüssel nach maximale Verkehrsmenge neu aushandeln"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Schlüssel nach maximaler Anzahl von Paketen neu aushandeln"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
@@ -521,11 +524,11 @@ msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
msgid "Replay protection sliding window size"
msgstr "Fenstergröße für \"Replay\"-Schutz"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Verwendungszweck von Zertifikaten überprüfen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
@@ -533,11 +536,11 @@ msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
msgid "Restart after remote ping timeout"
msgstr "Neu Starten nach Ping-Timeout an Gegenstellen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "Einschränkung der zulässigen zu verhandelnden Verschlüsselungen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS Timeout"
@@ -721,11 +724,11 @@ msgstr "Lokaler TCP oder UDP Port"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP oder UDP Port der Gegenstelle"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr "TLS 1.3 (oder neuer) Verschlüsselungsalgorithmus"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS Verschlüsselungsalgorithmus"
@@ -754,16 +757,16 @@ msgstr ""
"Die OVPN-Konfigurationsdatei (%s) konnte nicht gefunden werden, bitte "
"überprüfen Sie Ihre Konfiguration."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "Die höchste unterstützte TLS-Version"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "Schlüssel-Richtung für die Optionen 'tls-auth' und 'secret'"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "Die niedrigste unterstützte TLS-Version"
@@ -775,11 +778,11 @@ msgstr ""
"Die Größe der OVPN-Konfigurationsdatei (%s) ist zu groß für die Online-"
"Bearbeitung in der LuCI (&ge; 100KB)."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr "Vollständig Deaktivierung der Chiffren-Verhandlung"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Maximaler Zeitraum für Schlüsselaustausch"
diff --git a/applications/luci-app-openvpn/po/el/openvpn.po b/applications/luci-app-openvpn/po/el/openvpn.po
index 359739618..7f3b70c7d 100644
--- a/applications/luci-app-openvpn/po/el/openvpn.po
+++ b/applications/luci-app-openvpn/po/el/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -107,7 +107,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -192,7 +192,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -270,7 +270,7 @@ msgstr ""
msgid "Enabled"
msgstr "Ενεργοποιημένο"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -298,11 +298,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -347,7 +347,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -500,15 +500,15 @@ msgstr "Όνομα απομακρυσμένου μηχανήματος ή διε
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -516,11 +516,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -528,11 +528,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -712,11 +712,11 @@ msgstr "TCP/UDP αριθμός θύρας για το τοπικό (εξ'ορι
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP/UDP αριθμός θύρας για τον απομακρυσμένο (εξ'ορισμού=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -743,16 +743,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -762,11 +762,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index 61925d476..ca818a437 100644
--- a/applications/luci-app-openvpn/po/en/openvpn.po
+++ b/applications/luci-app-openvpn/po/en/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -38,7 +38,7 @@ msgstr "Add route after establishing connection"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Additional authentication over TLS"
@@ -51,7 +51,7 @@ msgstr "Allow client-to-client traffic"
msgid "Allow multiple clients with same certificate"
msgstr "Allow multiple clients with same certificate"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Allow only one session"
@@ -106,7 +106,7 @@ msgstr "Change process priority"
msgid "Change to directory before initialization"
msgstr "Change to directory before initialization"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Check peer certificate against a CRL"
@@ -191,7 +191,7 @@ msgstr "Don't actually execute ifconfig"
msgid "Don't add routes automatically"
msgstr "Don't add routes automatically"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Don't cache --askpass or --auth-user-pass passwords"
@@ -269,7 +269,7 @@ msgstr "Enable management interface on <em>IP</em> <em>port</em>"
msgid "Enabled"
msgstr "Enabled"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr "Encrypt and authenticate all control channel packets with the key"
@@ -297,11 +297,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Exit on TLS negotiation failure"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Get PEM password from controlling tty before we daemonize"
@@ -345,7 +345,7 @@ msgstr "Keep remote IP address on restart"
msgid "Keep tun/tap device open on restart"
msgstr "Keep tun/tap device open on restart"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Key transition window"
@@ -387,7 +387,7 @@ msgstr "Number of lines for log file history"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Only accept connections from given X509 name"
@@ -498,15 +498,15 @@ msgstr "Remote host name or ip address"
msgid "Remote ping timeout"
msgstr "Remote ping timeout"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegotiate data chan. key after bytes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renegotiate data chan. key after packets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Renegotiate data chan. key after seconds"
@@ -514,11 +514,11 @@ msgstr "Renegotiate data chan. key after seconds"
msgid "Replay protection sliding window size"
msgstr "Replay protection sliding window size"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Require explicit designation on certificate"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Require explicit key usage on certificate"
@@ -526,11 +526,11 @@ msgstr "Require explicit key usage on certificate"
msgid "Restart after remote ping timeout"
msgstr "Restart after remote ping timeout"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmit timeout on TLS control channel"
@@ -710,11 +710,11 @@ msgstr "TCP/UDP port # for local (default=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP/UDP port # for remote (default=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS cipher"
@@ -741,16 +741,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -760,11 +760,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Timeframe for key exchange"
diff --git a/applications/luci-app-openvpn/po/es/openvpn.po b/applications/luci-app-openvpn/po/es/openvpn.po
index e1f22acb6..fb625987e 100644
--- a/applications/luci-app-openvpn/po/es/openvpn.po
+++ b/applications/luci-app-openvpn/po/es/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"X-Generator: Poedit 2.2.1\n"
"Language-Team: \n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Añadir la ruta tras establecer la conexión"
msgid "Add template based configuration"
msgstr "Agregar configuración basada en plantillas"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Autentificación adicional con TLS"
@@ -51,7 +51,7 @@ msgstr "Permitir el tráfico cliente-a-cliente"
msgid "Allow multiple clients with same certificate"
msgstr "Permitir múltiples clientes con el mismo certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Permitir sólo una sesión"
@@ -105,7 +105,7 @@ msgstr "Cambiar la prioridad del proceso"
msgid "Change to directory before initialization"
msgstr "Cambiar a este directorio antes de inicializar"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Comprobar certificados contra un CRL"
@@ -190,7 +190,7 @@ msgstr "No ejecutar ifconfig"
msgid "Don't add routes automatically"
msgstr "No añadir rutas automáticamente"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "No guardar las contraseñas --askpass o --auth-user-pass"
@@ -269,7 +269,7 @@ msgstr "Habilitar la interfaz de administración en <em>IP</em> <em>puerto</em>"
msgid "Enabled"
msgstr "habilitado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
"Cifre y autentique todos los paquetes del canal de control con la clave"
@@ -302,11 +302,11 @@ msgstr ""
"Ejecutado en modo servidor cuando una ruta, dirección IPv4 o dirección MAC "
"se añade a la tabla de rutas interna de OpenVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Salir si falla la negociación"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Obtener la clave PEM del tty de control antes de demonizar"
@@ -352,7 +352,7 @@ msgstr "Mantener la dirección IP remota al reiniciar"
msgid "Keep tun/tap device open on restart"
msgstr "Mantener el dispositivo TUN/TAP abierto al reiniciar"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Ventana de transición de clave"
@@ -394,7 +394,7 @@ msgstr "Líneas en el archivo de registro histórico"
msgid "OVPN configuration file upload"
msgstr "Carga del archivo de configuración OVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Aceptar solo conexiones desde este nombre X509"
@@ -507,15 +507,15 @@ msgstr "Nombre de máquina remota o dirección IP"
msgid "Remote ping timeout"
msgstr "Tiempo de espera de ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Bytes tras los que renegociar la clave del canal del datos"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Paquetes tras los que renegociar la clave del canal del datos"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Segundos tras los que renegociar la clave del canal del datos"
@@ -523,11 +523,11 @@ msgstr "Segundos tras los que renegociar la clave del canal del datos"
msgid "Replay protection sliding window size"
msgstr "Tamaño de la ventana deslizante de la protección de reproducción"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Designación explícita de certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Clave de uso explícita de certificado"
@@ -535,11 +535,11 @@ msgstr "Clave de uso explícita de certificado"
msgid "Restart after remote ping timeout"
msgstr "Reiniciar después de tiempo de espera de ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "Restringir los cifrados permitidos para ser negociados"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Espera de retransmisión en el canal de control TLS"
@@ -721,11 +721,11 @@ msgstr "Número de puerto TCP/UDP para local (default=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Número de puerto TCP/UDP para remoto (default=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Cifrado TLS"
@@ -755,16 +755,16 @@ msgstr ""
"No se pudo encontrar el archivo de configuración OVPN (%s), verifique su "
"configuración."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "La versión TLS más alta soportada"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "La dirección clave para las opciones 'tls-auth' y 'secret'"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "La versión TLS más baja soportada"
@@ -776,11 +776,11 @@ msgstr ""
"El tamaño del archivo de configuración OVPN (%s) es demasiado grande para la "
"edición en línea en LuCI (&ge; 100 KB)."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr "Esto deshabilita completamente la negociación de cifrado."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Tiempo de intercambio de clave"
diff --git a/applications/luci-app-openvpn/po/fr/openvpn.po b/applications/luci-app-openvpn/po/fr/openvpn.po
index 243bcdf48..8a58a74f4 100644
--- a/applications/luci-app-openvpn/po/fr/openvpn.po
+++ b/applications/luci-app-openvpn/po/fr/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Ajouter un routage après l'établissement de la connexion"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Authentification supplémentaire par dessus TLS"
@@ -51,7 +51,7 @@ msgstr "Autoriser le trafic entre clients"
msgid "Allow multiple clients with same certificate"
msgstr "Permettre à plusieurs clients d'utiliser le même certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Autoriser seulement une session"
@@ -109,7 +109,7 @@ msgstr "Modifier la priorité du processus"
msgid "Change to directory before initialization"
msgstr "Aller dans ce répertorie avant l'initialisation"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
"Confronter le certificat du distant à une liste des certificats révoqués "
@@ -198,7 +198,7 @@ msgstr "Ne pas exécuter réellement ifconfig"
msgid "Don't add routes automatically"
msgstr "Ne pas ajouter de routes automatiquement"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
"Ne pas copier en cache les mots de passe des options --askpass ou --auth-"
@@ -278,7 +278,7 @@ msgstr "Activer l'interface de gestion sur <em>IP</em> <em>port</em>"
msgid "Enabled"
msgstr "Activé"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -311,11 +311,11 @@ msgstr ""
"Lancé en mode serveur à chaque fois qu'une adresse/route IPv4 ou une adresse "
"MAC est ajoutée à la table de routage interne d'OpenVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Arrêter suite à l'échec de la négociation TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
"Obtenir le mot de passe du certificat depuis le terminal avant de passer en "
@@ -363,7 +363,7 @@ msgstr "Conserver l'adresse IP distante lors du redémarrage"
msgid "Keep tun/tap device open on restart"
msgstr "Conserver le périphérique tun/tap ouvert au redémarrage"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -405,7 +405,7 @@ msgstr "Nombre de lignes de l'historique du fichier-journal"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Accepte seulement des connexions du nom X509 donné"
@@ -518,15 +518,15 @@ msgstr "Nom ou adresse IP de l'hôte distant"
msgid "Remote ping timeout"
msgstr "Délai de ping du distant"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renégocier la clé du canal de données après tant d'octets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renégocier la clé du canal de données après tant de paquets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
"Renégocier la clé du canal de données après tant de temps (en secondes)"
@@ -535,11 +535,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr "Taille de la fenêtre glissante pour la protection anti-rejeu"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Exiger l'appellation explicite sur le certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Exiger l'utilisation explicite de la clé sur le certificat"
@@ -547,11 +547,11 @@ msgstr "Exiger l'utilisation explicite de la clé sur le certificat"
msgid "Restart after remote ping timeout"
msgstr "Redémarrer aprés le dépassement du délai de ping du distant"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Renvoyer l'expiration du délai sur le canal de contrôle TLS"
@@ -732,11 +732,11 @@ msgstr "Numéro de port TCP/UDP pour l'hôte local (par défaut 1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Numéro de port TCP/UDP pour l'hôte distant (par défaut 1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Méthode de chiffrement TLS"
@@ -763,16 +763,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -782,11 +782,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Période d'un échange de clés"
diff --git a/applications/luci-app-openvpn/po/he/openvpn.po b/applications/luci-app-openvpn/po/he/openvpn.po
index ff4022e9d..a58e8c4c6 100644
--- a/applications/luci-app-openvpn/po/he/openvpn.po
+++ b/applications/luci-app-openvpn/po/he/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -186,7 +186,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -264,7 +264,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -292,11 +292,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -493,15 +493,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -509,11 +509,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -521,11 +521,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,11 +705,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -736,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -755,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/hu/openvpn.po b/applications/luci-app-openvpn/po/hu/openvpn.po
index 51d2218df..b0688085a 100644
--- a/applications/luci-app-openvpn/po/hu/openvpn.po
+++ b/applications/luci-app-openvpn/po/hu/openvpn.po
@@ -11,8 +11,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -36,7 +36,7 @@ msgstr "Útvonal hozzáadása a kapcsolat létrejötte után"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "További hitelesítés TLS-en keresztül"
@@ -49,7 +49,7 @@ msgstr "Ügyfél-ügyfél közötti kapcsolat engedélyezése"
msgid "Allow multiple clients with same certificate"
msgstr "Több ügyfél engedélyezése ugyanazzal a tanúsítvánnyal"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Csak egy munkafolyamat engedélyezése"
@@ -105,7 +105,7 @@ msgstr "Folyamat prioritásának módosítása"
msgid "Change to directory before initialization"
msgstr "Váltás a könyvtárra inicializáslás előtt"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Kliens tanúsítvány összevetése a tiltólistával."
@@ -190,7 +190,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr "Ne adjon hozzá útvonalakat automatikusan "
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
msgid "Enabled"
msgstr "Engedélyezve"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -296,11 +296,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -344,7 +344,7 @@ msgstr "Távoli IP cím megtartása újraindításkor"
msgid "Keep tun/tap device open on restart"
msgstr "tun/tap eszközök nyitva tartása újraindításkor"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -386,7 +386,7 @@ msgstr "Naplófájl történet sorainak száma"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -497,15 +497,15 @@ msgstr "Távoli gép név vagy IP cím"
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -513,11 +513,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -525,11 +525,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -709,11 +709,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS titkosító"
@@ -740,16 +740,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -759,11 +759,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/it/openvpn.po b/applications/luci-app-openvpn/po/it/openvpn.po
index f15ec1549..9a29cec9f 100644
--- a/applications/luci-app-openvpn/po/it/openvpn.po
+++ b/applications/luci-app-openvpn/po/it/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Aggiungi rotte dopo aver stabilito la connessione"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Autenticazione addizionale over TLS"
@@ -51,7 +51,7 @@ msgstr "Permetti traffico client-client"
msgid "Allow multiple clients with same certificate"
msgstr "Permetti più client con lo stesso certificato"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Permetti solo una sessione"
@@ -105,7 +105,7 @@ msgstr "Cambia priorità del processo"
msgid "Change to directory before initialization"
msgstr "Cambia cartella prima dell'inizializzazione"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Verifica il certificato del nodo su una CRL"
@@ -190,7 +190,7 @@ msgstr "Non eseguire realmente ifconfig"
msgid "Don't add routes automatically"
msgstr "Non aggiungere rotte automaticamente"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Non tenere in memoria le password di --askpass o di --auth-user-pass"
@@ -268,7 +268,7 @@ msgstr "Abilita l'interfaccia di controllo su <em>IP</em> <em>port</em>"
msgid "Enabled"
msgstr "Abilitato"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
"Crittografa e autentica tutti i pacchetti del canale di controllo con la "
@@ -298,11 +298,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -346,7 +346,7 @@ msgstr "Mantieni l'IP remoto al riavvio"
msgid "Keep tun/tap device open on restart"
msgstr "Mantienti il device tun/tap aperto al riavvio"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -388,7 +388,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -499,15 +499,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -515,11 +515,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -527,11 +527,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -711,11 +711,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -742,16 +742,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -761,11 +761,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/ja/openvpn.po b/applications/luci-app-openvpn/po/ja/openvpn.po
index e8f5403fe..685cc7229 100644
--- a/applications/luci-app-openvpn/po/ja/openvpn.po
+++ b/applications/luci-app-openvpn/po/ja/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -51,7 +51,7 @@ msgstr "クライアント間通信を許可する"
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "1つのセッションのみを許可する"
@@ -105,7 +105,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -190,7 +190,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
msgid "Enabled"
msgstr "有効"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -296,11 +296,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -344,7 +344,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -497,15 +497,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -513,11 +513,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -525,11 +525,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -709,11 +709,11 @@ msgstr "TCP/UDP ポート (ローカル, 標準設定=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP/UDP ポート (リモート, 標準設定=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS 暗号化方式"
@@ -740,16 +740,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -759,11 +759,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/ms/openvpn.po b/applications/luci-app-openvpn/po/ms/openvpn.po
index 0ffe3fb72..a5891c488 100644
--- a/applications/luci-app-openvpn/po/ms/openvpn.po
+++ b/applications/luci-app-openvpn/po/ms/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -185,7 +185,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -263,7 +263,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -291,11 +291,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -492,15 +492,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -508,11 +508,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -520,11 +520,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,11 +704,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -735,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -754,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/no/openvpn.po b/applications/luci-app-openvpn/po/no/openvpn.po
index ff4022e9d..a58e8c4c6 100644
--- a/applications/luci-app-openvpn/po/no/openvpn.po
+++ b/applications/luci-app-openvpn/po/no/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -186,7 +186,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -264,7 +264,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -292,11 +292,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -493,15 +493,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -509,11 +509,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -521,11 +521,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,11 +705,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -736,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -755,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/pl/openvpn.po b/applications/luci-app-openvpn/po/pl/openvpn.po
index 1bfc504e3..bf850b91e 100644
--- a/applications/luci-app-openvpn/po/pl/openvpn.po
+++ b/applications/luci-app-openvpn/po/pl/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -37,7 +37,7 @@ msgstr "Dodaj trasę po nawiązaniu połączenia"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Dodatkowe uwierzytelnianie poprzez TLS"
@@ -50,7 +50,7 @@ msgstr "Zezwól na łączność klient-klient"
msgid "Allow multiple clients with same certificate"
msgstr "Zezwól na łączenie wielu klientów z tym samym certyfikatem."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Zezwól tylko na jedną sesję"
@@ -106,7 +106,7 @@ msgstr "Zmień priorytet procesu"
msgid "Change to directory before initialization"
msgstr "Przejdź do katalogu przed inicjalizacją"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Sprawdź certyfikat peera na obecność w CRL"
@@ -191,7 +191,7 @@ msgstr "Nie uruchamiaj obecnie ifconfig"
msgid "Don't add routes automatically"
msgstr "Nie dodawaj tras (routes) automatycznie"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Nie cacheuj haseł --askpass lub --auth-user-pass"
@@ -269,7 +269,7 @@ msgstr "Włącz interfejs zarządzalny na <em>IP</em> <em>port</em>"
msgid "Enabled"
msgstr "Włączone"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -301,11 +301,11 @@ msgstr ""
"Wykonane w trybie serwera, gdy adres IPv4, trasa lub adres MAC są dodane do "
"wewnętrznej tablicy routingu w OpenVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Wyjdź przy niepowodzeniu negocjacji TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Uzyskaj hasło PEM z kontroli tty przed demonizacją"
@@ -351,7 +351,7 @@ msgstr "Zachowaj zdalny adres IP przy restarcie"
msgid "Keep tun/tap device open on restart"
msgstr "Utrzymaj urządzenie tun/tap po restarcie jako otwarte"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Okno zmiany klucza"
@@ -393,7 +393,7 @@ msgstr "Liczba linii w pliku dziennika historii"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Akceptuj tylko połączenia z podanej nazwy X509"
@@ -505,15 +505,15 @@ msgstr "Nazwa lub IP zdalnego hosta"
msgid "Remote ping timeout"
msgstr "Zdalny ping upłynął czas"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegocjacja danych charakteru klucza po bajtach"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renegocjacja danych charakteru klucza po pakietach"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Renegocjacja danych charakteru klucza po sekundach"
@@ -521,11 +521,11 @@ msgstr "Renegocjacja danych charakteru klucza po sekundach"
msgid "Replay protection sliding window size"
msgstr "Powtórzenie osłony okna rozmiaru"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Potrzebna Podpis na Certyfikacie"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Potrzebna klucza używanego w certyfikacie"
@@ -533,11 +533,11 @@ msgstr "Potrzebna klucza używanego w certyfikacie"
msgid "Restart after remote ping timeout"
msgstr "restart po zdalnym ping upływie czasu"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmisja po upływie czasu TLS na kanale kontrolnym"
@@ -724,11 +724,11 @@ msgstr "Numer portu TCP/UDP dla lokalnego (domyślnie=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Numer portu TCP/UDP dla zdalnego (domyślnie=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Kodowanie TLS"
@@ -755,16 +755,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -774,11 +774,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/pt-br/openvpn.po b/applications/luci-app-openvpn/po/pt-br/openvpn.po
index 4efb08a2f..3c3ad3f05 100644
--- a/applications/luci-app-openvpn/po/pt-br/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt-br/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"X-Generator: Poedit 2.1.1\n"
"Language-Team: \n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Adicionar rota após estabelecimento da conexão"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Autenticação adicional por TLS"
@@ -51,7 +51,7 @@ msgstr "Permitir tráfego entre os clientes"
msgid "Allow multiple clients with same certificate"
msgstr "Permitir múltiplos clientes com o mesmo certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Permitir apenas uma sessão"
@@ -107,7 +107,7 @@ msgstr "Alterar prioridade do processo"
msgid "Change to directory before initialization"
msgstr "Mudar para o diretório antes da iniciação"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Verificar certificado do parceiro conta uma CRL"
@@ -192,7 +192,7 @@ msgstr "Não executar ifconfig de verdade"
msgid "Don't add routes automatically"
msgstr "Não adicionar rotas automaticamente"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Não colocar em cache as senhas do --askpass ou --auth-user-pass "
@@ -270,7 +270,7 @@ msgstr "Ativar o interface de gestão em <em>IP</em> <em>porta</em>"
msgid "Enabled"
msgstr "Ativado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr "Cifre e autentique todos os pacotes do canal de controle com a chave"
@@ -302,11 +302,11 @@ msgstr ""
"Executado em modo servidor quando um endereço/rota IPv4 é adicionao na "
"tabela de roteamento interna do OpenVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Fechar quando existir falha na negociacao TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
@@ -352,7 +352,7 @@ msgstr "Manter o endereço IP remoto entre os reinícios"
msgid "Keep tun/tap device open on restart"
msgstr "Manter o dispositivo tun/tap aberto entre os reinícios"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Janela para transição de chaves"
@@ -394,7 +394,7 @@ msgstr "Número de linhas para o histórico do registo"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Aceitar conexões apenas de um dado nome X509"
@@ -505,15 +505,15 @@ msgstr "Nome do equipamento ou endereço IP remoto"
msgid "Remote ping timeout"
msgstr "Tempo limite do ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegociar chave do canal de dados após n bytes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renegociar chave do canal de dados após n pacotes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Renegociar chave do canal de dados após n segundos"
@@ -521,11 +521,11 @@ msgstr "Renegociar chave do canal de dados após n segundos"
msgid "Replay protection sliding window size"
msgstr "Tamanho da janela de proteção conta replay"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Requerer designação específica no certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Requerer que o uso da chave seja explicitado no certificado"
@@ -533,11 +533,11 @@ msgstr "Requerer que o uso da chave seja explicitado no certificado"
msgid "Restart after remote ping timeout"
msgstr "Reiniciar após estouro do tempo do ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Estouro de tempo de retransmissão no canal de controle TLS"
@@ -717,11 +717,11 @@ msgstr "Porta TCP/UDP para local (padrão=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Porta TCP/UDP para remoto (padrão=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Cifra TLS"
@@ -748,16 +748,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "A mais alta versão suporta do TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "A direção da chave para as opções 'tls-auth' e 'secret'"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "A mais baixa versão suporta do TLS"
@@ -767,11 +767,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Janela temporal para troca de chaves"
diff --git a/applications/luci-app-openvpn/po/pt/openvpn.po b/applications/luci-app-openvpn/po/pt/openvpn.po
index ed017714b..f396d573b 100644
--- a/applications/luci-app-openvpn/po/pt/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.6\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Adicionar rota após estabelecimento da ligação"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Autenticação adicional por TLS"
@@ -51,7 +51,7 @@ msgstr "Permitir tráfego cliente-a-cliente"
msgid "Allow multiple clients with same certificate"
msgstr "Permitir multiplos clientes com o mesmo certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Permitir apenas uma sessão"
@@ -107,7 +107,7 @@ msgstr "Alterar prioridade do processo"
msgid "Change to directory before initialization"
msgstr "Mudar para o directório antes da inicialização"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Verificar certificado do remoto conta uma CRL"
@@ -192,7 +192,7 @@ msgstr "Não executar ifconfig"
msgid "Don't add routes automatically"
msgstr "Não adicionar rotas automaticamente"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Não colocar em cache as passwords --askpass ou --auth-user-pass "
@@ -270,7 +270,7 @@ msgstr "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
msgid "Enabled"
msgstr "Activado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -302,11 +302,11 @@ msgstr ""
"Executado em modo de servidor quando um endereço IPv4/rota ou endereço MAC é "
"adicionado à tabela interna de roteamento do OpernVPN."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Fechar quando existir falha na negociação TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
@@ -352,7 +352,7 @@ msgstr "Manter o endereço IP remoto entre reinicios"
msgid "Keep tun/tap device open on restart"
msgstr "Manter o dispositivo tun/tap aberto entre reinicios"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Janela para transição de chaves"
@@ -394,7 +394,7 @@ msgstr "Numero de linhas para o historico do registo"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Aceitar ligações apenas de um dado nome X509"
@@ -505,15 +505,15 @@ msgstr "Hostname endereço IP remoto"
msgid "Remote ping timeout"
msgstr "Timeout do ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegociar chave do canal de dados após n bytes "
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Renegociar chave do canal de dados após n pacotes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Renegociar chave do canal de dados após n segundos"
@@ -521,11 +521,11 @@ msgstr "Renegociar chave do canal de dados após n segundos"
msgid "Replay protection sliding window size"
msgstr "Tamanho da janela de protecção conta replay"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Requerer designação específica no certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Requerer utilização explicita de utilização de chave no certificado"
@@ -533,11 +533,11 @@ msgstr "Requerer utilização explicita de utilização de chave no certificado"
msgid "Restart after remote ping timeout"
msgstr "Reiniciar após timeout do ping remoto"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Timeout de retransmissão no canal de controlo TLS"
@@ -717,11 +717,11 @@ msgstr "Porta TCP/UDP para local (predefinição=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Porta TCP/UDP para remoto (predefinição=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Cifra TLS"
@@ -748,16 +748,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -767,11 +767,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Janela temporal para troca de chaves"
diff --git a/applications/luci-app-openvpn/po/ro/openvpn.po b/applications/luci-app-openvpn/po/ro/openvpn.po
index 45ff97e43..5c562d26a 100644
--- a/applications/luci-app-openvpn/po/ro/openvpn.po
+++ b/applications/luci-app-openvpn/po/ro/openvpn.po
@@ -10,8 +10,8 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -35,7 +35,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -48,7 +48,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -265,7 +265,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -293,11 +293,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -341,7 +341,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -494,15 +494,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -510,11 +510,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -522,11 +522,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -706,11 +706,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -737,16 +737,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -756,11 +756,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po
index 2186c1e06..410a9ba69 100644
--- a/applications/luci-app-openvpn/po/ru/openvpn.po
+++ b/applications/luci-app-openvpn/po/ru/openvpn.po
@@ -15,8 +15,8 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, "
"все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -40,7 +40,7 @@ msgstr "Добавить маршрут после установки соеди
msgid "Add template based configuration"
msgstr "Добавить конфигурацию на основе шаблона"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Дополнительная аутентификация используя TLS"
@@ -54,7 +54,7 @@ msgid "Allow multiple clients with same certificate"
msgstr ""
"Разрешить одновременное подключение нескольких клиентов с одним сертификатом"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Разрешить только одну сессию"
@@ -111,7 +111,7 @@ msgstr "Изменить приоритет процесса после иниц
msgid "Change to directory before initialization"
msgstr "Перейти в указанную папку перед инициализацией"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Проверить сертификат узла на соответствие файлу CRL в формате PEM"
@@ -207,7 +207,7 @@ msgstr ""
"Не добавлять маршруты автоматически. Вместо этого передавать маршруты в '-"
"route-up' скрипт используя переменные окружения"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
"Не кэшировать пароли '-askpass' или '-auth-user-pass' в виртуальной памяти"
@@ -306,7 +306,7 @@ msgstr ""
msgid "Enabled"
msgstr "Включено"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
"Шифрование и проверка подлинности всех пакетов каналов управления с помощью "
@@ -340,11 +340,11 @@ msgstr ""
"Выполнять в режиме сервера '-mode server' каждый раз, когда адрес/маршрут "
"IPv4 или MAC-адрес добавлен в таблицу маршрутизации OpenVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Выйти при ошибке согласования использования протокола TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Получить PEM пароль от управления tty, прежде чем включить демон"
@@ -393,7 +393,7 @@ msgstr "Не изменять удалённый IP-адрес при перез
msgid "Keep tun/tap device open on restart"
msgstr "Сохранять виртуальное устройство tun/tap запущенным при перезагрузке"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Окно передачи ключей"
@@ -435,7 +435,7 @@ msgstr "Количество строк в файле журнала"
msgid "OVPN configuration file upload"
msgstr "Загрузка конфигурационного файла OVPN"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Принимать только соединения от имени указанного сертификата X509"
@@ -556,19 +556,19 @@ msgstr "Имя удалённого хоста или IP-адрес"
msgid "Remote ping timeout"
msgstr "Время ожидания удаленного пинг-запроса"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
"Повторное согласование ключа канала данных после отправки или получения n "
"байт (по умолчанию отключено)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
"Повторное согласование ключа канала данных после отправки и получения n "
"пакетов (по умолчанию отключено)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
"Повторное согласование ключа канала данных через n секунд (по умолчанию 3600)"
@@ -579,11 +579,11 @@ msgstr ""
"Использовать защиту от повтора - скользящее окно размером 'n' с интервалом "
"времени 't' секунд"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Требовать явного указания в сертификате"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Требовать явного использования ключа в сертификате"
@@ -591,11 +591,11 @@ msgstr "Требовать явного использования ключа в
msgid "Restart after remote ping timeout"
msgstr "Перезапуск после таймаута ожидания удаленного пинг-запроса"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "Ограничить разрешенные шифры согласования"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
"Пакет ретранслирует тайм-аут на канале управления протокола TLS, если нет "
@@ -794,11 +794,11 @@ msgstr "Номер локального TCP/UDP порта (1194 по умолч
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Номер удалённого TCP/UDP порта (1194 по умолчанию)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "Алгоритм шифрования TLS"
@@ -825,16 +825,16 @@ msgid ""
"configuration."
msgstr "OPVN файл (%s) не найден, проверьте вашу конфигурацию."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "Самая высокая поддерживаемая версия протокола TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "Указать ключ для параметров 'tls-auth' и 'secret'"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "Самая низкая поддерживаемая версия протокола TLS"
@@ -846,11 +846,11 @@ msgstr ""
"Размер OPVN файла (%s) слишком большой для онлайн редактирования в LuCI (&ge "
"100 Кб)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr "Отключение механизма согласования шифров"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Временные рамки для обмена ключами"
diff --git a/applications/luci-app-openvpn/po/sk/openvpn.po b/applications/luci-app-openvpn/po/sk/openvpn.po
index 485ecad62..839b2ae56 100644
--- a/applications/luci-app-openvpn/po/sk/openvpn.po
+++ b/applications/luci-app-openvpn/po/sk/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -185,7 +185,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -263,7 +263,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -291,11 +291,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -492,15 +492,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -508,11 +508,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -520,11 +520,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,11 +704,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -735,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -754,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po
index ec7a65933..c0c59ef23 100644
--- a/applications/luci-app-openvpn/po/sv/openvpn.po
+++ b/applications/luci-app-openvpn/po/sv/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -34,7 +34,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Ytterligare autentisering via TLS"
@@ -47,7 +47,7 @@ msgstr "Tillåt klient-till-klienttraffik"
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -186,7 +186,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -264,7 +264,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -292,11 +292,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -493,15 +493,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -509,11 +509,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -521,11 +521,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,11 +705,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -736,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -755,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot
index b43be441f..231b48f5c 100644
--- a/applications/luci-app-openvpn/po/templates/openvpn.pot
+++ b/applications/luci-app-openvpn/po/templates/openvpn.pot
@@ -1,8 +1,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -39,7 +39,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -93,7 +93,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -284,11 +284,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -332,7 +332,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -374,7 +374,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -485,15 +485,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -501,11 +501,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -513,11 +513,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -697,11 +697,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -728,16 +728,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -747,11 +747,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/tr/openvpn.po b/applications/luci-app-openvpn/po/tr/openvpn.po
index 29cf48a6d..d176b674b 100644
--- a/applications/luci-app-openvpn/po/tr/openvpn.po
+++ b/applications/luci-app-openvpn/po/tr/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
msgid "Allow multiple clients with same certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -185,7 +185,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -263,7 +263,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -291,11 +291,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -492,15 +492,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -508,11 +508,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -520,11 +520,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,11 +704,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -735,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -754,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/uk/openvpn.po b/applications/luci-app-openvpn/po/uk/openvpn.po
index 18a30f0e8..b99f8e88c 100644
--- a/applications/luci-app-openvpn/po/uk/openvpn.po
+++ b/applications/luci-app-openvpn/po/uk/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.4\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -37,7 +37,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr ""
@@ -50,7 +50,7 @@ msgstr "Дозволити обмін трафіком між клієнтами
msgid "Allow multiple clients with same certificate"
msgstr "Дозволити декілька клієнтів з однаковим сертифікатом"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Дозволити лише одну сесію"
@@ -104,7 +104,7 @@ msgstr ""
msgid "Change to directory before initialization"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
msgid "Don't add routes automatically"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr ""
@@ -267,7 +267,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -295,11 +295,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr ""
@@ -343,7 +343,7 @@ msgstr ""
msgid "Keep tun/tap device open on restart"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr ""
@@ -385,7 +385,7 @@ msgstr ""
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr ""
@@ -496,15 +496,15 @@ msgstr ""
msgid "Remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr ""
@@ -512,11 +512,11 @@ msgstr ""
msgid "Replay protection sliding window size"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr ""
@@ -524,11 +524,11 @@ msgstr ""
msgid "Restart after remote ping timeout"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -708,11 +708,11 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr ""
@@ -739,16 +739,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -758,11 +758,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr ""
diff --git a/applications/luci-app-openvpn/po/vi/openvpn.po b/applications/luci-app-openvpn/po/vi/openvpn.po
index 92245cf55..ba6bb3afe 100644
--- a/applications/luci-app-openvpn/po/vi/openvpn.po
+++ b/applications/luci-app-openvpn/po/vi/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Pootle 1.1.0\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr ""
@@ -37,7 +37,7 @@ msgstr "Thêm tuyến sau khi kết nối thành lập"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "Xác thực bổ xung trên TLS"
@@ -50,7 +50,7 @@ msgstr "Cho phép lưu thông đối tượng - đến - đối tượng"
msgid "Allow multiple clients with same certificate"
msgstr "Cho phép nhiều đối tượng với cùng một chứng chỉ"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "Chỉ cho phép một session"
@@ -106,7 +106,7 @@ msgstr "Thay đổi quy trình ưu tiên"
msgid "Change to directory before initialization"
msgstr "Chuyển qua thư mục trước khi khởi tạo"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "Kiểm tra chứng chỉ đối tác với một CRL"
@@ -191,7 +191,7 @@ msgstr "Đừng thực sự thực hiện ifconfig"
msgid "Don't add routes automatically"
msgstr "Đừng tự động thêm vào đường dẫn"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Don't cache --askpass or --auth-user-pass passwords"
@@ -269,7 +269,7 @@ msgstr "Kích hoạt giao diện điều hành trên <em>IP</em> <em>cổng</em>
msgid "Enabled"
msgstr "Kích hoạt "
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -297,11 +297,11 @@ msgid ""
"added to OpenVPN's internal routing table"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "Exit trên TLS khi thương lượng thất bại"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "Lấy mật mã PEM từ điều khiển tty trước khi chúng ta daemonize"
@@ -345,7 +345,7 @@ msgstr "Giữ remote địa chỉ IP ở chế độ khởi động"
msgid "Keep tun/tap device open on restart"
msgstr "Giữ công cụ tun/tap mở khi khởi động lại "
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "Key transition window"
@@ -387,7 +387,7 @@ msgstr "Số dòng cho tập tin log history"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "Chỉ chấp nhận kết nối từ những tên X509 cho sẵn"
@@ -498,15 +498,15 @@ msgstr "Tên host ngoài vùng và địa chỉ IP"
msgid "Remote ping timeout"
msgstr "PING timeout từ xa"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "Thương lượng lại data chan. key sau bytes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "Thương lượng lại data chan. key sau packets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "Thương lượng lại data chan. key sau seconds"
@@ -514,11 +514,11 @@ msgstr "Thương lượng lại data chan. key sau seconds"
msgid "Replay protection sliding window size"
msgstr "Replay chế độ bảo vệ kích thước window trượt"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "Yêu cầu rõ ràng về giấy chứng nhận "
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
@@ -526,11 +526,11 @@ msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
msgid "Restart after remote ping timeout"
msgstr "Khởi động lại sau khi remote ping timeout"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmit timeout trên kênh kiểm soát TLS"
@@ -710,11 +710,11 @@ msgstr "Cổng TCP/UDP # cho địa phương (default=1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "Cổng TCP/UDP # cho ngoài vùng (default=1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS cipher"
@@ -741,16 +741,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr ""
@@ -760,11 +760,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "Timeframe cho trao đổi key"
diff --git a/applications/luci-app-openvpn/po/zh-cn/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
index 0c8aff383..7b3564c54 100644
--- a/applications/luci-app-openvpn/po/zh-cn/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
@@ -16,8 +16,8 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -41,7 +41,7 @@ msgstr "建立连接后添加路由"
msgid "Add template based configuration"
msgstr "添加基于模板的配置"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "TLS 以外的验证"
@@ -54,7 +54,7 @@ msgstr "允许客户端到客户端的通信"
msgid "Allow multiple clients with same certificate"
msgstr "允许多用户共用同一证书"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "只允许一个会话"
@@ -108,7 +108,7 @@ msgstr "改变进程优先级"
msgid "Change to directory before initialization"
msgstr "初始化前改变根目录"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "验证客户端证书以确保其是否过期"
@@ -193,7 +193,7 @@ msgstr "不实际执行 ifconfig 命令"
msgid "Don't add routes automatically"
msgstr "不自动添加路由"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "不缓存 --askpass 或 --auth-user-pass passwords"
@@ -271,7 +271,7 @@ msgstr "在 <em>IP</em> <em>port</em> 上启用可管理接口"
msgid "Enabled"
msgstr "启用"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr "使用密钥加密及认证所有的控制通道数据包"
@@ -300,11 +300,11 @@ msgid ""
msgstr ""
"服务器模式下,将每个 IPv4 地址/路由或 MAC 地址添加到 OpenVPN 的内部路由表中。"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "TLS 验证失败后退出"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "后台运行前从控制的 tty 中获取 PEM 密码"
@@ -348,7 +348,7 @@ msgstr "服务重启时保持远程 IP 地址"
msgid "Keep tun/tap device open on restart"
msgstr "服务重启时自动打开 tun/tap 设备"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "密钥传输滑动窗口"
@@ -390,7 +390,7 @@ msgstr "历史日志文件的行数"
msgid "OVPN configuration file upload"
msgstr "OVPN 配置文件上传"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "只接收已给定的 X509 名称的连接"
@@ -501,15 +501,15 @@ msgstr "远程主机名或 ip 地址"
msgid "Remote ping timeout"
msgstr "远程 ping 超时"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "传输若干字节后重新验证数据通道密钥"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "传输若干数据包后重新验证数据通道密钥"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "传输若干秒后重新验证数据通道密钥"
@@ -517,11 +517,11 @@ msgstr "传输若干秒后重新验证数据通道密钥"
msgid "Replay protection sliding window size"
msgstr "重播保护的滑动窗口大小"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "证书需要显式指定"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "证书需要明确的密钥"
@@ -529,11 +529,11 @@ msgstr "证书需要明确的密钥"
msgid "Restart after remote ping timeout"
msgstr "远程 ping 超时后重启"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "限定协商时允许的密码算法"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS 控制通道超时后重新发送"
@@ -713,11 +713,11 @@ msgstr "TCP/UDP 端口 # 本地(默认 1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP/UDP 端口 # 远程(默认 1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS 加密"
@@ -744,16 +744,16 @@ msgid ""
"configuration."
msgstr "无法找到 OVPN 配置文件(%s),请检查您的配置。"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "最高支持的 TLS 版本"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "“tls-auth”和“secret”选项的密钥类型"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "最低支持的 TLS 版本"
@@ -763,11 +763,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr "OVPN 配置文件(%s)过大,无法使用 LuCI 在线编辑(&ge; 100 KB)。"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr "这将完全禁用密码协商"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "密钥交换时间表"
diff --git a/applications/luci-app-openvpn/po/zh-tw/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
index ecc45bab4..3372722f8 100644
--- a/applications/luci-app-openvpn/po/zh-tw/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
@@ -16,8 +16,8 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
msgid "%s"
msgstr "%s"
@@ -41,7 +41,7 @@ msgstr "建立連線後新增路由"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Additional authentication over TLS"
msgstr "TLS 以外的驗證"
@@ -54,7 +54,7 @@ msgstr "允許客戶端到客戶端的通訊"
msgid "Allow multiple clients with same certificate"
msgstr "允許多使用者共用同一證書"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Allow only one session"
msgstr "只允許一個會話"
@@ -108,7 +108,7 @@ msgstr "改變程序優先順序"
msgid "Change to directory before initialization"
msgstr "初始化前改變根目錄"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
msgid "Check peer certificate against a CRL"
msgstr "驗證客戶端證書以確保其是否過期"
@@ -193,7 +193,7 @@ msgstr "不實際執行 ifconfig 指令"
msgid "Don't add routes automatically"
msgstr "不自動新增路由"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "不快取 --askpass 或 --auth-user-pass passwords"
@@ -271,7 +271,7 @@ msgstr "在 <em>IP</em> <em>port</em> 上啟用可管理介面"
msgid "Enabled"
msgstr "啟用"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr "使用金鑰加密及認證所有的控制通道資料包"
@@ -300,11 +300,11 @@ msgid ""
msgstr ""
"伺服器模式下,將每個 IPv4 位址/路由或 MAC 位址新增到 OpenVPN 的內部路由表中。"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Exit on TLS negotiation failure"
msgstr "TLS 驗證失敗後退出"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "後臺執行前從控制的 tty 中獲取 PEM 密碼"
@@ -348,7 +348,7 @@ msgstr "服務重啟時保持遠端 IP 位址"
msgid "Keep tun/tap device open on restart"
msgstr "服務重啟時自動開啟 tun/tap 裝置"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Key transition window"
msgstr "金鑰傳輸滑動視窗"
@@ -390,7 +390,7 @@ msgstr "歷史日誌檔案的行數"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
msgid "Only accept connections from given X509 name"
msgstr "只接收已給定的 X509 名稱的連線"
@@ -501,15 +501,15 @@ msgstr "遠端主機名或 ip 位址"
msgid "Remote ping timeout"
msgstr "遠端 ping 超時"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Renegotiate data chan. key after bytes"
msgstr "傳輸若干位元組後重新驗證資料通道金鑰"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
msgid "Renegotiate data chan. key after packets"
msgstr "傳輸若干資料包後重新驗證資料通道金鑰"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Renegotiate data chan. key after seconds"
msgstr "傳輸若干秒後重新驗證資料通道金鑰"
@@ -517,11 +517,11 @@ msgstr "傳輸若干秒後重新驗證資料通道金鑰"
msgid "Replay protection sliding window size"
msgstr "重播保護的滑動視窗大小"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "Require explicit designation on certificate"
msgstr "證書需要顯式指定"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Require explicit key usage on certificate"
msgstr "證書需要明確的金鑰"
@@ -529,11 +529,11 @@ msgstr "證書需要明確的金鑰"
msgid "Restart after remote ping timeout"
msgstr "遠端 ping 超時後重啟"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS 控制通道超時後重新發送"
@@ -713,11 +713,11 @@ msgstr "TCP/UDP 埠 # 本地(預設 1194)"
msgid "TCP/UDP port # for remote (default=1194)"
msgstr "TCP/UDP 埠 # 遠端(預設 1194)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "TLS 1.3 or newer cipher"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "TLS cipher"
msgstr "TLS 加密"
@@ -744,16 +744,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
msgid "The highest supported TLS version"
msgstr "最高支援的 TLS 版本"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
msgid "The key direction for 'tls-auth' and 'secret' options"
msgstr "“tls-auth”和“secret”選項的金鑰型別"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
msgid "The lowest supported TLS version"
msgstr "最低支援的 TLS 版本"
@@ -763,11 +763,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Timeframe for key exchange"
msgstr "金鑰交換時間表"
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index 7cd8514a4..57a9367e1 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
LUCI_PKGARCH:=all
-PKG_RELEASE:=27
+PKG_RELEASE:=35
include ../../luci.mk
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
index 155cb9547..3ec4c4399 100644
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
@@ -1,6 +1,9 @@
-- Copyright 2016-2018 Stan Grishin <stangri@melmac.net>
-- Licensed to the public under the Apache License 2.0.
+local readmeURL = "https://github.com/openwrt/packages/tree/master/net/simple-adblock/files/README.md"
+-- local readmeURL = "https://github.com/stangri/openwrt_packages/tree/master/simple-adblock/files/README.md"
+
local packageName = "simple-adblock"
local uci = require "luci.model.uci".cursor()
local util = require "luci.util"
@@ -10,7 +13,35 @@ local fs = require "nixio.fs"
local http = require "luci.http"
local dispatcher = require "luci.dispatcher"
local enabledFlag = uci:get(packageName, "config", "enabled")
-local command
+local command, outputFile, outputCache, outputGzip
+local targetDNS = uci:get(packageName, "config", "dns")
+
+if not targetDNS or targetDNS == "" then
+ targetDNS = "dnsmasq.servers"
+end
+
+if targetDNS ~= "dnsmasq.addnhosts" and targetDNS ~= "dnsmasq.conf" and
+ targetDNS ~= "dnsmasq.servers" and targetDNS ~= "unbound.adb_list" then
+ targetDNS = "dnsmasq.servers"
+end
+
+if targetDNS == "dnsmasq.addnhosts" then
+ outputFile="/var/run/" .. packageName .. ".addnhosts"
+ outputCache="/var/run/" .. packageName .. ".addnhosts.cache"
+ outputGzip="/etc/" .. packageName .. ".addnhosts.gz"
+elseif targetDNS == "dnsmasq.conf" then
+ outputFile="/var/dnsmasq.d/" .. packageName .. ""
+ outputCache="/var/run/" .. packageName .. ".dnsmasq.cache"
+ outputGzip="/etc/" .. packageName .. ".dnsmasq.gz"
+elseif targetDNS == "dnsmasq.servers" then
+ outputFile="/var/run/" .. packageName .. ".servers"
+ outputCache="/var/run/" .. packageName .. ".servers.cache"
+ outputGzip="/etc/" .. packageName .. ".servers.gz"
+elseif targetDNS == "unbound.adb_list" then
+ outputFile="/var/lib/unbound/adb_list." .. packageName .. ""
+ outputCache="/var/run/" .. packageName .. ".unbound.cache"
+ outputGzip="/etc/" .. packageName .. ".unbound.gz"
+end
m = Map("simple-adblock", translate("Simple AdBlock Settings"))
m.apply_on_parse = true
@@ -59,11 +90,11 @@ else
en.title = translate("Service is disabled/stopped")
en.inputtitle = translate("Enable/Start")
en.inputstyle = "apply important"
- if fs.access("/var/run/simple-adblock.cache") then
+ if fs.access(outputCache) then
sm = h:option(DummyValue, "_dummy", translate("Info"))
sm.template = "simple-adblock/status"
- sm.value = "Cache file containing " .. util.trim(sys.exec("wc -l < /var/run/simple-adblock.cache")) .. " domains found."
- elseif fs.access("/etc/$simple-adblock.gz") then
+ sm.value = "Cache file containing " .. util.trim(sys.exec("wc -l < " .. outputCache)) .. " domains found."
+ elseif fs.access(outputGzip) then
sm = h:option(DummyValue, "_dummy", translate("Info"))
sm.template = "simple-adblock/status"
sm.value = "Compressed cache file found."
@@ -117,17 +148,15 @@ s = m:section(NamedSection, "config", "simple-adblock", translate("Configuration
-- General options
s:tab("basic", translate("Basic Configuration"))
-o2 = s:taboption("basic", ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity"))
+o2 = s:taboption("basic", ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity."))
o2:value("0", translate("Suppress output"))
o2:value("1", translate("Some output"))
o2:value("2", translate("Verbose output"))
-o2.rmempty = false
o2.default = 2
-o3 = s:taboption("basic", ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking"))
+o3 = s:taboption("basic", ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking."))
o3:value("0", translate("Let local devices use their own DNS servers if set"))
o3:value("1", translate("Force Router DNS server to all local devices"))
-o3.rmempty = false
o3.default = 1
local sysfs_path = "/sys/class/leds/"
@@ -138,7 +167,7 @@ end
if #leds ~= 0 then
o4 = s:taboption("basic", Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in")
.. [[ <a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
- .. translate("System LED Configuration") .. [[</a>]])
+ .. translate("System LED Configuration") .. [[</a>]] .. ".")
o4.rmempty = false
o4:value("", translate("none"))
for k, v in ipairs(leds) do
@@ -148,62 +177,78 @@ end
s:tab("advanced", translate("Advanced Configuration"))
-o6 = s:taboption("advanced", Value, "boot_delay", translate("Delay (in seconds) for on-boot start"), translate("Run service after set delay on boot"))
-o6.default = 120
-o6.datatype = "range(1,600)"
-
-o7 = s:taboption("advanced", Value, "download_timeout", translate("Download time-out (in seconds)"), translate("Stop the download if it is stalled for set number of seconds"))
-o7.default = 10
-o7.datatype = "range(1,60)"
-
-o5 = s:taboption("advanced", ListValue, "parallel_downloads", translate("Simultaneous processing"), translate("Launch all lists downloads and processing simultaneously, reducing service start time"))
-o5:value("0", translate("Do not use simultaneous processing"))
-o5:value("1", translate("Use simultaneous processing"))
-o5.rmempty = false
-o5.default = 1
+dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), translate("Pick the DNS resolution option to create the adblock list for, see the") .. " "
+ .. [[<a href="]] .. readmeURL .. [[#dns-resolution-option" target="_blank">]]
+ .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
+dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts"))
+dns:value("dnsmasq.conf", translate("DNSMASQ Config"))
+dns:value("dnsmasq.servers", translate("DNSMASQ Servers File"))
+dns:value("unbound.adb_list", translate("Unbound AdBlock List"))
+dns.default = "dnsmasq.servers"
+
+ipv6 = s:taboption("advanced", ListValue, "ipv6_enabled", translate("IPv6 Support"), translate("Add IPv6 entries to block-list."))
+ipv6:value("", translate("Do not add IPv6 entries"))
+ipv6:value("1", translate("Add IPv6 entries"))
+ipv6:depends({dns="dnsmasq.addnhosts"})
+ipv6.default = ""
+ipv6.rmempty = true
+
+o5 = s:taboption("advanced", Value, "boot_delay", translate("Delay (in seconds) for on-boot start"), translate("Run service after set delay on boot."))
+o5.default = 120
+o5.datatype = "range(1,600)"
+
+o6 = s:taboption("advanced", Value, "download_timeout", translate("Download time-out (in seconds)"), translate("Stop the download if it is stalled for set number of seconds."))
+o6.default = 10
+o6.datatype = "range(1,60)"
+
+o7 = s:taboption("advanced", Value, "curl_retry", translate("Curl download retry"), translate("If curl is installed and detected, it would retry download this many times on timeout/fail."))
+o7.default = 3
+o7.datatype = "range(0,30)"
+
+o8 = s:taboption("advanced", ListValue, "parallel_downloads", translate("Simultaneous processing"), translate("Launch all lists downloads and processing simultaneously, reducing service start time."))
+o8:value("0", translate("Do not use simultaneous processing"))
+o8:value("1", translate("Use simultaneous processing"))
+o8.default = 1
o9 = s:taboption("advanced", ListValue, "allow_non_ascii", translate("Allow Non-ASCII characters in DNSMASQ file"), translate("Only enable if your version of DNSMASQ supports the use of Non-ASCII characters, otherwise DNSMASQ will fail to start."))
o9:value("0", translate("Do not allow Non-ASCII"))
o9:value("1", translate("Allow Non-ASCII"))
-o9.rmempty = false
o9.default = "0"
-o10 = s:taboption("advanced", ListValue, "compressed_cache", translate("Store compressed cache file on router"), translate("Attempt to create a compressed cache of final block-list on the router."))
+o10 = s:taboption("advanced", ListValue, "compressed_cache", translate("Store compressed cache file on router"), translate("Attempt to create a compressed cache of block-list in the persistent memory."))
o10:value("0", translate("Do not store compressed cache"))
o10:value("1", translate("Store compressed cache"))
-o10.rmempty = false
o10.default = "0"
-o8 = s:taboption("advanced", ListValue, "debug", translate("Enable Debugging"), translate("Enables debug output to /tmp/simple-adblock.log"))
-o8:value("0", translate("Disable Debugging"))
-o8:value("1", translate("Enable Debugging"))
-o8.rmempty = false
-o8.default = "0"
+o11 = s:taboption("advanced", ListValue, "debug", translate("Enable Debugging"), translate("Enables debug output to /tmp/simple-adblock.log."))
+o11:value("0", translate("Disable Debugging"))
+o11:value("1", translate("Enable Debugging"))
+o11.default = "0"
s2 = m:section(NamedSection, "config", "simple-adblock", translate("Whitelist and Blocklist Management"))
-- Whitelisted Domains
-d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))
+d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted."))
d1.addremove = false
d1.optional = false
-- Blacklisted Domains
-d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted"))
+d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted."))
d3.addremove = false
d3.optional = false
-- Whitelisted Domains URLs
-d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted"))
+d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted."))
d2.addremove = false
d2.optional = false
-- Blacklisted Domains URLs
-d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted"))
+d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted."))
d4.addremove = false
d4.optional = false
-- Blacklisted Hosts URLs
-d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted"))
+d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted."))
d5.addremove = false
d5.optional = false
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
deleted file mode 100644
index 22672124f..000000000
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
+++ /dev/null
@@ -1,69 +0,0 @@
-m = Map("simple-adblock", translate("Simple AdBlock Settings"))
-s = m:section(NamedSection, "config", "simple-adblock")
-
--- General options
-e = s:option(Flag, "enabled", translate("Start Simple Adblock service"))
-e.rmempty = false
-function e.write(self, section, value)
- if value ~= "1" then
- luci.sys.init.stop("simple-adblock")
- end
- return Flag.write(self, section, value)
-end
-
-o2 = s:option(ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity"))
-o2:value("0", translate("Suppress output"))
-o2:value("1", translate("Some output"))
-o2:value("2", translate("Verbose output"))
-o2.rmempty = false
-o2.default = 2
-
-o3 = s:option(ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking"))
-o3:value("0", translate("Let local devices use their own DNS servers if set"))
-o3:value("1", translate("Force Router DNS server to all local devices"))
-o3.rmempty = false
-o3.default = 1
-
-local sysfs_path = "/sys/class/leds/"
-local leds = {}
-if nixio.fs.access(sysfs_path) then
- leds = nixio.util.consume((nixio.fs.dir(sysfs_path)))
-end
-if #leds ~= 0 then
- o3 = s:option(Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in")
- .. [[ <a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
- .. translate("System LED Configuration") .. [[</a>]])
- o3.rmempty = true
- o3:value("", translate("none"))
- for k, v in ipairs(leds) do
- o3:value(v)
- end
-end
-
-s2 = m:section(NamedSection, "config", "simple-adblock")
--- Whitelisted Domains
-d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))
-d1.addremove = false
-d1.optional = false
-
--- Blacklisted Domains
-d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted"))
-d3.addremove = false
-d3.optional = false
-
--- Whitelisted Domains URLs
-d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted"))
-d2.addremove = false
-d2.optional = false
-
--- Blacklisted Domains URLs
-d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted"))
-d4.addremove = false
-d4.optional = false
-
--- Blacklisted Hosts URLs
-d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted"))
-d5.addremove = false
-d5.optional = false
-
-return m
diff --git a/applications/luci-app-simple-adblock/po/es/simple-adblock.po b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
index 38fbed646..502c5e68d 100644
--- a/applications/luci-app-simple-adblock/po/es/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 22:58-0300\n"
+"PO-Revision-Date: 2019-09-17 22:46-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -12,150 +12,185 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr "Añadir entradas IPv6"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr "Añadir entradas IPv6 a la lista de bloqueo."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr "Configuración avanzada"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr "Permitir no ASCII"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr "Permitir caracteres no ASCII en el archivo DNSMASQ"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-"Intente crear un caché comprimido de la lista de bloqueo final en el "
-"enrutador."
+"Intente crear un caché comprimido de la lista de bloqueo en la memoria "
+"persistente."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "Configuración básica"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "URLs de dominio en lista negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "Dominios en la lista negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "URLs de hosts en lista negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr "Errores recopilados"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr "Configuración"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Controla el registro del sistema y la salida de consola."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+"Controla el registro del sistema y la verbosidad de salida de la consola."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr "Intento de descarga de Curl"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr "Servicio de DNS"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr "Hosts adicionales de DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr "Config de DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr "Archivo de servidores DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr "Retardo (en segundos) para el inicio en el arranque"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr "Deshabilitar depuración"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr "No añadir entradas IPv6"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr "No permitir no ASCII"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr "No almacene caché comprimido"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr "No use procesamiento simultáneo"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr "Tiempo de espera de descarga (en segundos)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr "Habilitar depuración"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr "Habilitar/Iniciar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "Habilitar la salida de depuración a /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr "Habilita la salida de depuración a /tmp/simple-adblock.log."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "Forzar enrutador DNS"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "Forzar el servidor DNS del enrutador a todos los dispositivos locales"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-"Forza el uso del DNS del enrutador en dispositivos locales, también conocido "
-"como Secuestro de DNS"
+"Fuerza el uso de DNS del enrutador en dispositivos locales, también "
+"conocido como secuestro de DNS."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Dominios individuales para ser incluidos en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr "Soporte de IPv6"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Dominios individuales para ser incluidos en la lista blanca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+"Si curl está instalado y detectado, volvería a intentar descargar esto "
+"muchas veces en tiempo de espera/falla."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr "Dominios individuales para ser incluidos en la lista negra."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr "Dominios individuales para ser incluidos en la lista blanca."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr "Info"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED para indicar estado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
"Inicie todas las descargas y el procesamiento de listas simultáneamente, "
-"reduciendo el tiempo de inicio del servicio"
+"reduciendo el tiempo de inicio del servicio."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Dejar que los dispositivos locales usen sus propios servidores DNS si están "
"configurados"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr "Mensaje"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
@@ -163,39 +198,47 @@ msgstr ""
"Solo habilítelo si su versión de DNSMASQ admite el uso de caracteres no "
"ASCII; de lo contrario, DNSMASQ no se iniciará."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "Configuración de verbosidad de salida"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+"Elija la opción de resolución DNS para crear la lista de bloqueos de "
+"anuncios, consulte el"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "Elige el LED que no se haya usado en"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr "LÉEME"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr "Recargar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "Ejecutar el servicio después de establecer el retraso en el arranque"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr "Ejecute el servicio después de la demora establecida en el arranque."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr "Estado del servicio"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr "El servicio está deshabilitado/detenido"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr "El servicio está habilitado/iniciado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr "Servicio iniciado con error"
@@ -203,94 +246,139 @@ msgstr "Servicio iniciado con error"
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
-msgstr "Ajustes de Simple AdBlock "
+msgstr "Configuración de Simple AdBlock "
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr "Procesamiento simultáneo"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "Alguna salida"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Iniciar el servicio Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-"Detenga la descarga si se detiene durante un número de segundos establecido"
+"Detenga la descarga si está detenida durante un número determinado de "
+"segundos."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr "Detener/Deshabilitar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr "Almacenar caché comprimido"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr "Almacene el archivo de caché comprimido en el enrutador"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "Suprimir salida"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "Configuración del sistema LED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr "Tarea"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL a listas de dominios que se incluirán en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr "URL a listas de dominios que se incluirán en la lista negra."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr "URL a listas de dominios que se incluirán en la lista blanca."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr "URL a listas de hosts que se incluirán en la lista negra."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr "Lista de AdBlock Unbound"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr "Usar procesamiento simultáneo"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "Salida verbosa"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr "Gestión de listas blancas y listas de bloqueo"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "URLs de dominio en lista blanca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "Dominios en lista blanca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr "para detalles."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "ninguno"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Controla el registro del sistema y la salida de consola."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forza el uso del DNS del enrutador en dispositivos locales, también "
+#~ "conocido como Secuestro de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista blanca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Iniciar el servicio Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+
+#~ msgid ""
+#~ "Attempt to create a compressed cache of final block-list on the router."
+#~ msgstr ""
+#~ "Intente crear un caché comprimido de la lista de bloqueo final en el "
+#~ "enrutador."
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "Habilitar la salida de depuración a /tmp/simple-adblock.log"
+
+#~ msgid ""
+#~ "Launch all lists downloads and processing simultaneously, reducing "
+#~ "service start time"
+#~ msgstr ""
+#~ "Inicie todas las descargas y el procesamiento de listas simultáneamente, "
+#~ "reduciendo el tiempo de inicio del servicio"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr ""
+#~ "Ejecutar el servicio después de establecer el retraso en el arranque"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "Detenga la descarga si se detiene durante un número de segundos "
+#~ "establecido"
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index b5f9c73dc..d6786289d 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -12,182 +12,218 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr "詳細設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "基本設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "ドメイン ブラックリストのURL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "ブラックリスト ドメイン"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "hosts ブラックリストのURL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr "設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "システム ログとコンソール出力の冗長性を設定します。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr "ブート時遅延実行(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr "デバッグ無効"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr "ダウンロード タイムアウト(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr "デバッグ有効"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr "有効化/開始"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "ルーターDNSの強制"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、"
-"DNS ハイジャックとしても知られています。"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "ブラックリストに登録する、個々のドメインです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "ホワイトリストに登録する、個々のドメインです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "ステータスを表示するLED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr "DNSサーバーの使用を強制しない"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "出力詳細度の設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "右の設定で既に使用されていないLEDを選択します"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr "リロード"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "システムのブート時に、設定された遅延でサービスを開始します。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr "サービス ステータス"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr "サービスは無効/停止中"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr "サービスは有効/実行中"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr "サービス開始時にエラーが発生"
@@ -195,94 +231,123 @@ msgstr "サービス開始時にエラーが発生"
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "Simple AdBlock 設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "軽量出力"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Simple Adblock サービスを開始"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-"問題等が発生して指定された秒数を超過した場合、ダウンロードを停止します。"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr "停止/無効化"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "出力の抑制"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "LED 設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "ブラックリストに登録するドメインのリストのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "ホワイトリストに登録するドメインのリストのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "詳細出力"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr "ホワイトリストとブラックリストの管理"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "ドメイン ホワイトリストのURL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "ホワイトリスト ドメイン"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "なし"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "システム ログとコンソール出力の冗長性を設定します。"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これ"
+#~ "は、DNS ハイジャックとしても知られています。"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "ブラックリストに登録する、個々のドメインです。"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録する、個々のドメインです。"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Simple Adblock サービスを開始"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "ブラックリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr ""
+#~ "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "システムのブート時に、設定された遅延でサービスを開始します。"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "問題等が発生して指定された秒数を超過した場合、ダウンロードを停止します。"
diff --git a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
index 57ad5c5f1..1a1fe5902 100644
--- a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
@@ -11,186 +11,220 @@ msgstr ""
"Language: pt_BR\n"
"X-Generator: Poedit 2.1.1\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr "Configurações Avançadas"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "Configurações Básicas"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "Domínios para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr "Configuração"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr "Atraso (em segundos) para o início quando o equipamento é ligado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr "Desabilitar Depuração"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr "Tempo limite ao baixar (em segundos)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr "Habilitar Depuração"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr "Habilitar/Iniciar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "Habilitar a saída da depuração para /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED para indicar o estado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
"definidos"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "Definição do detalhamento do registro"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr "Recarregar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "Rodar o serviço depois de um atraso quando o equipamento é ligado"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr "Estado do Serviço"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr "O serviço está desabilitado/parado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr "O serviço está habilitado/rodando"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr "O serviço iniciou com erro"
@@ -198,97 +232,127 @@ msgstr "O serviço iniciou com erro"
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "Configuração do Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "Pouco detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Inicie o serviço Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-"Para de baixar se estiver trancado por um determinado número de segundos"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr "Parar/Desabilitar"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "Suprimir"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "Configuração do LED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "Detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr "Gerenciamento de Listas Branca e Preta"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "Domínios para a Lista Branca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "nenhum"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Inicie o serviço Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "Habilitar a saída da depuração para /tmp/simple-adblock.log"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "Rodar o serviço depois de um atraso quando o equipamento é ligado"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "Para de baixar se estiver trancado por um determinado número de segundos"
+
#~ msgid "Enable/start service"
#~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index a15fd29cc..7010df158 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -1,186 +1,220 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "Domínios para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED para indicar o estado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
"definidos"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "Definição do detalhamento do registro"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr ""
@@ -188,96 +222,114 @@ msgstr ""
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "Configuração do Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "Pouco detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "Suprimir"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "Configuração do LED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "Detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "Domínios para a Lista Branca"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "Nenhum"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
#~ msgid "Enable/start service"
#~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
index 5bb38c1a9..9bca395f9 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -15,183 +15,220 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, все проверялось в "
"графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "URL ссылки Черных<br />списков доменов"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "Черный список доменов"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "URL ссылки Черных<br />списков хостов"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Детальная настройка записи событий в системный журнал."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "Назначить DNS роутера"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "Назначить DNS роутера всем локальным устройствам"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-"Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Домены добавленные пользователем в Черный список."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Домены добавленные пользователем в Белый список."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED индикация состояния"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Разрешить локальным устройствам использовать собственные DNS, если они "
"прописаны в настройках сети устройства"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "Настройка журнала"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "Выберите LED не используется на странице"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr ""
@@ -199,93 +236,111 @@ msgstr ""
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "Simple AdBlock настройки"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "Частичная запись"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Запуск сервиса Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "Запретить запись"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "'Настройка LED индикации' системы."
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL ссылки Черных списков доменов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL ссылки Белых списков доменов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL ссылки Черных списков хостов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "Подробная запись"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "URL ссылки Белых списков доменов"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "Белый список доменов"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "ничего"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Детальная настройка записи событий в системный журнал."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Домены добавленные пользователем в Черный список."
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Домены добавленные пользователем в Белый список."
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Запуск сервиса Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL ссылки Черных списков доменов."
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL ссылки Белых списков доменов."
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL ссылки Черных списков хостов."
diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index d71018c08..9891a6fc0 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -1,180 +1,218 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "Svartlistade domänadresser"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "Svartlistade domäner"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "Svartlistade värdadresser"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Individuella domäner som ska svartlistas"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Individulla domäner som ska svartlistas"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED för att indikera status"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr ""
@@ -182,96 +220,98 @@ msgstr ""
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "Inställningar för Simple AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "Viss utmatning"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "Förträng utmatning"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "Utförlig utmatning"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "Vitlistade domänadresser"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "Vitlistade domäner"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "ingen"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Individuella domäner som ska svartlistas"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Individulla domäner som ska svartlistas"
+
#~ msgid "Enable/start service"
#~ msgstr "Aktivera/starta tjänsten"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 08e811778..723fbb0cf 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -1,180 +1,218 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr ""
@@ -182,93 +220,86 @@ msgstr ""
msgid "Simple AdBlock"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr ""
diff --git a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
index 04837cae2..eb98866e0 100644
--- a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
@@ -11,180 +11,218 @@ msgstr ""
"PO-Revision-Date: 2018-08-17 14:52+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr "高级配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "基本配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "列入黑名单的域名 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "列入黑名单的域名"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "列入黑名单的主机 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系统日志和控制台输出的详细程度"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr "开机启动延迟(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr "禁用调试"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr "下载超时(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr "启用调试"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr "启用/启动"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "启用到 /tmp/simple-adblock.log 的调试输出"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "强制路由器 DNS"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "强制路由器 DNS 服务所有本地设备"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "强制路由器 DNS 在本地设备上使用,也称为 DNS 劫持"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名单的单独域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名单的单独域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED 指示状态"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr "如果设置,让本地设备使用自己的 DNS 服务器"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "输出详细程度设置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "选择尚未使用的 LED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr "刷新"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "开机后延迟多少秒运行服务"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr "服务状态"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr "服务已禁用/已停止"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr "服务已启用/已启动"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr "服务启动时出错"
@@ -192,93 +230,119 @@ msgstr "服务启动时出错"
msgid "Simple AdBlock"
msgstr "简单 AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "简单 AdBlock 设置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "一些输出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "启动简单 Adblock 服务"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr "如果下载停滞设定的秒数后,则停止下载"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr "停止/禁用"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "抑制输出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "系统 LED 配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名单域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名单域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名单主机列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "详细输出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr "白名单和黑名单管理"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "白名单域名 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "白名单域名"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "无"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系统日志和控制台输出的详细程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "强制路由器 DNS 在本地设备上使用,也称为 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名单的单独域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名单的单独域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "启动简单 Adblock 服务"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名单域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名单域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名单主机列表的 URL"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "启用到 /tmp/simple-adblock.log 的调试输出"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "开机后延迟多少秒运行服务"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr "如果下载停滞设定的秒数后,则停止下载"
diff --git a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
index 8d76fe361..c64b994f9 100644
--- a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
@@ -11,180 +11,218 @@ msgstr ""
"PO-Revision-Date: 2018-08-17 14:52+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
msgstr "高階配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
msgid "Allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid "Allow Non-ASCII characters in DNSMASQ file"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "基本配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "Blacklisted Domain URLs"
msgstr "列入黑名單的域名 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Blacklisted Domains"
msgstr "列入黑名單的域名"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Blacklisted Hosts URLs"
msgstr "列入黑名單的主機 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
msgid "Collected Errors"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系統日誌和控制檯輸出的詳細程度"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
msgstr "開機啟動延遲(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
msgid "Disable Debugging"
msgstr "禁用除錯"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Do not store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
msgid "Do not use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Download time-out (in seconds)"
msgstr "下載超時(秒)"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "Enable Debugging"
msgstr "啟用除錯"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
msgid "Enable/Start"
msgstr "啟用/啟動"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "啟用到 /tmp/simple-adblock.log 的除錯輸出"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Force Router DNS"
msgstr "強制路由器 DNS"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "Force Router DNS server to all local devices"
msgstr "強制路由器 DNS 服務所有本地裝置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "強制路由器 DNS 在本地裝置上使用,也稱為 DNS 劫持"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名單的單獨域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名單的單獨域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
msgid "Info"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "LED to indicate status"
msgstr "LED 指示狀態"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
msgid "Let local devices use their own DNS servers if set"
msgstr "如果設定,讓本地裝置使用自己的 DNS 伺服器"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Message"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
msgid ""
"Only enable if your version of DNSMASQ supports the use of Non-ASCII "
"characters, otherwise DNSMASQ will fail to start."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Output Verbosity Setting"
msgstr "輸出詳細程度設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
msgid "Pick the LED not already used in"
msgstr "選擇尚未使用的 LED"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
msgstr "重新整理"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "開機後延遲多少秒執行服務"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Service Status"
msgstr "服務狀態"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
msgid "Service is disabled/stopped"
msgstr "服務已禁用/已停止"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
msgid "Service is enabled/started"
msgstr "服務已啟用/已啟動"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
msgid "Service started with error"
msgstr "服務啟動時出錯"
@@ -192,93 +230,119 @@ msgstr "服務啟動時出錯"
msgid "Simple AdBlock"
msgstr "簡單 AdBlock"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
msgid "Simple AdBlock Settings"
msgstr "簡單 AdBlock 設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
msgid "Some output"
msgstr "一些輸出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "啟動簡單 Adblock 服務"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr "如果下載停滯設定的秒數後,則停止下載"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
msgstr "停止/禁用"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "Store compressed cache"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "Store compressed cache file on router"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
msgid "Suppress output"
msgstr "抑制輸出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
msgid "System LED Configuration"
msgstr "系統 LED 配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名單域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名單域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名單主機列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
msgid "Verbose output"
msgstr "詳細輸出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
msgid "Whitelist and Blocklist Management"
msgstr "白名單和黑名單管理"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "Whitelisted Domain URLs"
msgstr "白名單域名 URL"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Whitelisted Domains"
msgstr "白名單域名"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "none"
msgstr "無"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系統日誌和控制檯輸出的詳細程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "強制路由器 DNS 在本地裝置上使用,也稱為 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名單的單獨域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名單的單獨域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "啟動簡單 Adblock 服務"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名單域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名單域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名單主機列表的 URL"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "啟用到 /tmp/simple-adblock.log 的除錯輸出"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "開機後延遲多少秒執行服務"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr "如果下載停滯設定的秒數後,則停止下載"
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
index ee3fd254f..56af1cc96 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
@@ -12,4 +12,25 @@ s = m:section( NamedSection, "collectd_cpu", "luci_statistics" )
enable = s:option( Flag, "enable", translate("Enable this plugin") )
enable.default = 0
+-- collectd_cpu.reportbycpu (ReportByCpu)
+reportbycpu = s:option( Flag, "ReportByCpu",
+ translate("Report by CPU"),
+ translate("By setting this, CPU is not aggregate of all processors on the system"))
+reportbycpu.default = 1
+reportbycpu:depends( "enable", 1 )
+
+-- collectd_cpu.reportbystate (ReportByState)
+reportbystate = s:option( Flag, "ReportByState",
+ translate("Report by state"),
+ translate("When set to true, reports per-state metric (system, user, idle)"))
+reportbystate.default = 1
+reportbystate:depends( "enable", 1 )
+
+-- collectd_cpu.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+ translate("Report in percent"),
+ translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends({ enable = 1, ReportByCpu = 1, ReportByState = 1 })
+
return m
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
index fa677b8d1..e5f3360c0 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
@@ -10,4 +10,18 @@ s = m:section( NamedSection, "collectd_memory", "luci_statistics" )
enable = s:option( Flag, "enable", translate("Enable this plugin") )
enable.default = 0
+-- collectd_memory.valuesabsolute (ValuesAbsolute)
+valuespercentage = s:option( Flag, "ValuesAbsolute",
+ translate("Absolute values"),
+ translate("When set to true, we request absolute values"))
+valuespercentage.default = 1
+valuespercentage:depends( "enable", 1 )
+
+-- collectd_memory.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+ translate("Percent values"),
+ translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends( "enable", 1 )
+
return m
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
index 004a450ee..bae325990 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
@@ -1,7 +1,7 @@
return {
legend = {
{ },
- { },
+ { "ValuesPercentage" , "ReportByCpu", "ReportByState" },
{ }
},
label = _("Processor"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
index 8dee2dafc..9ad1b3f88 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
@@ -1,7 +1,7 @@
return {
- legend = {
- { },
+ legend = {
{ },
+ { "ValuesPercentage", "ValuesAbsolute" },
{ }
},
label = _("Memory"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
index 226c84ee9..3f8910722 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
@@ -3,33 +3,167 @@
module("luci.statistics.rrdtool.definitions.cpu",package.seeall)
+local uci = require("luci.model.uci").cursor()
+local reportbystate = uci:get("luci_statistics", "collectd_cpu", "ReportByState") or "0"
+
function item()
return luci.i18n.translate("Processor")
end
function rrdargs( graph, plugin, plugin_instance, dtype )
+ local p = {}
+
+ local title = "%H: Processor usage"
+ if #plugin_instance > 0 then
+ title = "%H: Processor usage on core #%pi"
+ end
+
+ if reportbystate == "1" then
+ local cpu = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Jiffies",
+ number_format = "%5.1lf",
+ data = {
+ instances = {
+ cpu = {
+ "idle",
+ "interrupt",
+ "nice",
+ "softirq",
+ "steal",
+ "system",
+ "user",
+ "wait"
+ }
+ },
+ options = {
+ cpu_idle = {
+ color = "ffffff",
+ title = "Idle"
+ },
+ cpu_interrupt = {
+ color = "a000a0",
+ title = "Interrupt"
+ },
+ cpu_nice = {
+ color = "00e000",
+ title = "Nice"
+ },
+ cpu_softirq = {
+ color = "ff00ff",
+ title = "Softirq"
+ },
+ cpu_steal = {
+ color = "000000",
+ title = "Steal"
+ },
+ cpu_system = {
+ color = "ff0000",
+ title = "System"
+ },
+ cpu_user = {
+ color = "0000ff",
+ title = "User"
+ },
+ cpu_wait = {
+ color = "ffb000",
+ title = "Wait"
+ }
+ }
+ }
+ }
- return {
- title = "%H: Processor usage on core #%pi",
- y_min = "0",
- alt_autoscale_max = true,
- vlabel = "Percent",
- number_format = "%5.1lf%%",
- data = {
- instances = {
- cpu = { "user", "nice", "system", "softirq", "interrupt" }
- },
-
- options = {
- cpu_idle = { color = "ffffff", title = "Idle" },
- cpu_nice = { color = "00e000", title = "Nice" },
- cpu_user = { color = "0000ff", title = "User" },
- cpu_wait = { color = "ffb000", title = "Wait" },
- cpu_system = { color = "ff0000", title = "System" },
- cpu_softirq = { color = "ff00ff", title = "Softirq" },
- cpu_interrupt = { color = "a000a0", title = "Interrupt" },
- cpu_steal = { color = "000000", title = "Steal" }
+ local percent = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ data = {
+ instances = {
+ percent = {
+ "idle",
+ "interrupt",
+ "nice",
+ "softirq",
+ "steal",
+ "system",
+ "user",
+ "wait"
+ }
+ },
+ options = {
+ percent_idle = {
+ color = "ffffff",
+ title = "Idle"
+ },
+ percent_interrupt = {
+ color = "a000a0",
+ title = "Interrupt"
+ },
+ percent_nice = {
+ color = "00e000",
+ title = "Nice"
+ },
+ percent_softirq = {
+ color = "ff00ff",
+ title = "Softirq"
+ },
+ percent_steal = {
+ color = "000000",
+ title = "Steal"
+ },
+ percent_system = {
+ color = "ff0000",
+ title = "System"
+ },
+ percent_user = {
+ color = "0000ff",
+ title = "User"
+ },
+ percent_wait = {
+ color = "ffb000",
+ title = "Wait"
+ }
+ }
}
}
- }
+
+ local types = graph.tree:data_types( plugin, plugin_instance )
+
+ for _, t in ipairs(types) do
+ if t == "cpu" then
+ p[#p+1] = cpu
+ end
+
+ if t == "percent" then
+ p[#p+1] = percent
+ end
+ end
+ else
+ p = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ data = {
+ instances = {
+ percent = {
+ "active",
+ }
+ },
+ options = {
+ percent_active = {
+ color = "00e000",
+ title = "Active"
+ }
+ }
+ }
+ }
+ end
+
+ return p
end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
index d3596637b..cb7ae53af 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
@@ -48,12 +48,12 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
data = {
types = { "percent" },
options = {
- percent = { title = "%di Hz", negweight = true },
+ percent = { title = "%di kHz", negweight = true },
}
}
}
- return { cpufreq, transitions, percentage }
+ return { cpufreq, percentage, transitions }
else
return { cpufreq }
end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
index b05d31dc0..749c3e352 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
@@ -1,13 +1,5 @@
---[[
-
-(c) 2011 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-]]--
+-- Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.memory",package.seeall)
@@ -16,24 +8,92 @@ function item()
end
function rrdargs( graph, plugin, plugin_instance, dtype )
+ local p = {}
- return {
+ local memory = {
title = "%H: Memory usage",
vlabel = "MB",
number_format = "%5.1lf%s",
y_min = "0",
alt_autoscale_max = true,
data = {
- instances = {
- memory = { "free", "buffered", "cached", "used" }
+ instances = {
+ memory = {
+ "free",
+ "buffered",
+ "cached",
+ "used"
+ }
},
options = {
- memory_buffered = { color = "0000ff", title = "Buffered" },
- memory_cached = { color = "ff00ff", title = "Cached" },
- memory_used = { color = "ff0000", title = "Used" },
- memory_free = { color = "00ff00", title = "Free" }
+ memory_buffered = {
+ color = "0000ff",
+ title = "Buffered"
+ },
+ memory_cached = {
+ color = "ff00ff",
+ title = "Cached"
+ },
+ memory_used = {
+ color = "ff0000",
+ title = "Used"
+ },
+ memory_free = {
+ color = "00ff00",
+ title = "Free"
+ }
}
}
}
+
+ local percent = {
+ title = "%H: Memory usage",
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ y_min = "0",
+ alt_autoscale_max = true,
+ data = {
+ instances = {
+ percent = {
+ "free",
+ "buffered",
+ "cached",
+ "used"
+ }
+ },
+ options = {
+ percent_buffered = {
+ color = "0000ff",
+ title = "Buffered"
+ },
+ percent_cached = {
+ color = "ff00ff",
+ title = "Cached"
+ },
+ percent_used = {
+ color = "ff0000",
+ title = "Used"
+ },
+ percent_free = {
+ color = "00ff00",
+ title = "Free"
+ }
+ }
+ }
+ }
+
+ local types = graph.tree:data_types( plugin, plugin_instance )
+
+ for _, t in ipairs(types) do
+ if t == "percent" then
+ p[#p+1] = percent
+ end
+
+ if t == "memory" then
+ p[#p+1] = memory
+ end
+ end
+
+ return p
end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index c3645e408..b8d11c075 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -9,25 +9,62 @@ end
function rrdargs( graph, plugin, plugin_instance, dtype )
- return {
- -- Ping roundtrip time
- { title = "%H: ICMP Round Trip Time",
- vlabel = "ms",
- number_format = "%5.1lf ms",
- data = {
- sources = { ping = { "value" } },
- options = { ping__value = {
- noarea = true, overlay = true, title = "%di" } }
- } },
+ local ping = {
+ title = "%H: ICMP Round Trip Time",
+ vlabel = "ms",
+ number_format = "%5.1lf ms",
+ data = {
+ sources = {
+ ping = {
+ "value"
+ }
+ },
+ options = {
+ ping__value = {
+ noarea = true,
+ overlay = true,
+ title = "%di"
+ }
+ }
+ }
+ }
+
+ local droprate = {
+ title = "%H: ICMP Drop Rate",
+ vlabel = "%",
+ number_format = "%5.2lf %%",
+ data = {
+ types = {
+ "ping_droprate"
+ },
+ options = {
+ ping_droprate = {
+ noarea = true,
+ overlay = true,
+ title = "%di",
+ transform_rpn = "100,*"
+ }
+ }
+ }
+ }
- -- Ping droprate
- { title = "%H: ICMP Drop Rate",
- vlabel = "%",
- number_format = "%5.2lf %%",
- data = {
- types = { "ping_droprate" },
- options = { ping_droprate = {
- noarea = true, overlay = true, title = "%di" } }
- } }
+ local stddev = {
+ title = "%H: ICMP Standard Deviation",
+ vlabel = "ms",
+ number_format = "%5.1lf ms",
+ data = {
+ types = {
+ "ping_stddev"
+ },
+ options = {
+ ping_stddev = {
+ noarea = true,
+ overlay = true,
+ title = "%di"
+ }
+ }
+ }
}
+
+ return { ping, droprate, stddev }
end
diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po
index 319e82396..f785a5a8e 100644
--- a/applications/luci-app-statistics/po/ca/statistics.po
+++ b/applications/luci-app-statistics/po/ca/statistics.po
@@ -66,7 +66,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -262,6 +262,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Configuració del connector exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Monitoreig de classe filter"
@@ -484,6 +488,10 @@ msgstr "Monitoritza processos"
msgid "Monitor remote ports"
msgstr "Monitoritza els ports remots"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po
index 2a8d762f1..de5fd9b59 100644
--- a/applications/luci-app-statistics/po/cs/statistics.po
+++ b/applications/luci-app-statistics/po/cs/statistics.po
@@ -62,7 +62,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -258,6 +258,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Nastavení pluginu Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -479,6 +483,10 @@ msgstr "Sledovat procesy"
msgid "Monitor remote ports"
msgstr "Sledovat vzdálené porty"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po
index 3c6a57292..5a1e7e4fc 100644
--- a/applications/luci-app-statistics/po/de/statistics.po
+++ b/applications/luci-app-statistics/po/de/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Exec Plugin Konfiguration"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filterklassen überwachen"
@@ -486,6 +490,10 @@ msgstr "Überwachte Prozesse"
msgid "Monitor remote ports"
msgstr "entfernte Ports überwachen"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po
index fc829c1f7..0dfa4765f 100644
--- a/applications/luci-app-statistics/po/el/statistics.po
+++ b/applications/luci-app-statistics/po/el/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -262,6 +262,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -477,6 +481,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index cdc637715..d5d43b192 100644
--- a/applications/luci-app-statistics/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Exec Plugin Configuration"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filter class monitoring"
@@ -482,6 +486,10 @@ msgstr "Monitor processes"
msgid "Monitor remote ports"
msgstr "Monitor remote ports"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po
index 61cd15800..8cea6ad98 100644
--- a/applications/luci-app-statistics/po/es/statistics.po
+++ b/applications/luci-app-statistics/po/es/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr "Configuración del complemento de conmutadores de contexto de CPU"
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "Frecuencia de CPU"
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Configuración del plugin Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Monitorización del filtro de clases"
@@ -485,6 +489,10 @@ msgstr "Monitorizar procesos"
msgid "Monitor remote ports"
msgstr "Monitorizar puertos remotos"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr "Nombre"
diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po
index 0f8851468..df1e92a3a 100644
--- a/applications/luci-app-statistics/po/fr/statistics.po
+++ b/applications/luci-app-statistics/po/fr/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Configuration du greffon Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Surveillance des filtres"
@@ -483,6 +487,10 @@ msgstr "Processus à surveiller"
msgid "Monitor remote ports"
msgstr "Surveiller les ports destinataires"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po
index 81a260675..7880b49f3 100644
--- a/applications/luci-app-statistics/po/he/statistics.po
+++ b/applications/luci-app-statistics/po/he/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -257,6 +257,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -472,6 +476,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po
index c65047e2b..f7b6643fc 100644
--- a/applications/luci-app-statistics/po/hu/statistics.po
+++ b/applications/luci-app-statistics/po/hu/statistics.po
@@ -62,7 +62,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -258,6 +258,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Exec bővítmény beállítása"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Szűrő osztály figyelése"
@@ -484,6 +488,10 @@ msgstr "Folyamatok figyelése"
msgid "Monitor remote ports"
msgstr "Távoli portok figyelése"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po
index e4b8a46a7..6e90a6e1e 100644
--- a/applications/luci-app-statistics/po/it/statistics.po
+++ b/applications/luci-app-statistics/po/it/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -260,6 +260,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -482,6 +486,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po
index 26ea4f270..0835dff7e 100644
--- a/applications/luci-app-statistics/po/ja/statistics.po
+++ b/applications/luci-app-statistics/po/ja/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "CPU 周波数"
@@ -259,6 +259,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr "Exec プラグイン設定"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -484,6 +488,10 @@ msgstr "プロセスをモニターする"
msgid "Monitor remote ports"
msgstr "リモートのポートをモニターする"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po
index 9a767e932..9526e071d 100644
--- a/applications/luci-app-statistics/po/ms/statistics.po
+++ b/applications/luci-app-statistics/po/ms/statistics.po
@@ -61,7 +61,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -254,6 +254,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -469,6 +473,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po
index ce66fdf30..9842297b1 100644
--- a/applications/luci-app-statistics/po/no/statistics.po
+++ b/applications/luci-app-statistics/po/no/statistics.po
@@ -55,7 +55,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -251,6 +251,10 @@ msgstr "Program"
msgid "Exec Plugin Configuration"
msgstr "Program plugin konfigurasjon"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filter class overvåking"
@@ -471,6 +475,10 @@ msgstr "Overvåk prosesser"
msgid "Monitor remote ports"
msgstr "Overvåk eksterne porter"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po
index 940f684f4..bc3da79e3 100644
--- a/applications/luci-app-statistics/po/pl/statistics.po
+++ b/applications/luci-app-statistics/po/pl/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -261,6 +261,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Konfiguracja wtyczki Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Monitorowanie filtra klas"
@@ -485,6 +489,10 @@ msgstr "Monitoruj procesy"
msgid "Monitor remote ports"
msgstr "Monitoruj porty zdalne"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po
index c514088b6..62b646fa1 100644
--- a/applications/luci-app-statistics/po/pt-br/statistics.po
+++ b/applications/luci-app-statistics/po/pt-br/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr "Configuração do Módulo de Troca de Contexto da CPU"
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "Frequência da CPU"
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Configuração do plugin Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Monitoramento das Classes de Filtros"
@@ -488,6 +492,10 @@ msgstr "Monitorar processos"
msgid "Monitor remote ports"
msgstr "Monitorar portas remotas"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po
index f85add662..2b643dd34 100644
--- a/applications/luci-app-statistics/po/pt/statistics.po
+++ b/applications/luci-app-statistics/po/pt/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -260,6 +260,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Configuração do plugin Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Monitoramento das Classes de Filtros"
@@ -484,6 +488,10 @@ msgstr "Monitorar processos"
msgid "Monitor remote ports"
msgstr "Monitorar portas remotas"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po
index f0080b346..2756192b0 100644
--- a/applications/luci-app-statistics/po/ro/statistics.po
+++ b/applications/luci-app-statistics/po/ro/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -261,6 +261,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -476,6 +480,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po
index 81201ec79..61f676f1b 100644
--- a/applications/luci-app-statistics/po/ru/statistics.po
+++ b/applications/luci-app-statistics/po/ru/statistics.po
@@ -66,7 +66,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr "Настройка плагина переключений контекста CPU"
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "Частота CPU"
@@ -261,6 +261,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Настройка плагина «Exec»"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Мониторинг класса фильтров"
@@ -489,6 +493,10 @@ msgstr "Мониторить процессы"
msgid "Monitor remote ports"
msgstr "Мониторить удаленные порты"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr "Имя"
diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po
index 912e7096e..606a8fac5 100644
--- a/applications/luci-app-statistics/po/sk/statistics.po
+++ b/applications/luci-app-statistics/po/sk/statistics.po
@@ -59,7 +59,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -252,6 +252,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -467,6 +471,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po
index 83e7b4c8d..2e73625c5 100644
--- a/applications/luci-app-statistics/po/sv/statistics.po
+++ b/applications/luci-app-statistics/po/sv/statistics.po
@@ -60,7 +60,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -256,6 +256,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Konfiguration av insticksprogrammet Exec"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -472,6 +476,10 @@ msgstr "Övervaka processer"
msgid "Monitor remote ports"
msgstr "Övervaka fjärrportar"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot
index c616dd7cd..96fd319d0 100644
--- a/applications/luci-app-statistics/po/templates/statistics.pot
+++ b/applications/luci-app-statistics/po/templates/statistics.pot
@@ -52,7 +52,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -245,6 +245,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -460,6 +464,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po
index 219702811..09986d6bb 100644
--- a/applications/luci-app-statistics/po/tr/statistics.po
+++ b/applications/luci-app-statistics/po/tr/statistics.po
@@ -60,7 +60,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -253,6 +253,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -468,6 +472,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po
index d87fa0428..fac692b3b 100644
--- a/applications/luci-app-statistics/po/uk/statistics.po
+++ b/applications/luci-app-statistics/po/uk/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -258,6 +258,10 @@ msgstr ""
msgid "Exec Plugin Configuration"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr ""
@@ -473,6 +477,10 @@ msgstr ""
msgid "Monitor remote ports"
msgstr ""
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po
index 86e6cb409..1c40fa41c 100644
--- a/applications/luci-app-statistics/po/vi/statistics.po
+++ b/applications/luci-app-statistics/po/vi/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr ""
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr ""
@@ -261,6 +261,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Cấu hình Exec Plugin"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filter class monitoring"
@@ -483,6 +487,10 @@ msgstr "Monitor processes"
msgid "Monitor remote ports"
msgstr "Monitor remote ports"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr ""
diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po
index 424a4255c..27a6749b8 100644
--- a/applications/luci-app-statistics/po/zh-cn/statistics.po
+++ b/applications/luci-app-statistics/po/zh-cn/statistics.po
@@ -67,7 +67,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr "CPU 上下文切换插件配置"
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "CPU 频率"
@@ -262,6 +262,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Exec 插件配置"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filter 类监测"
@@ -481,6 +485,10 @@ msgstr "监测进程"
msgid "Monitor remote ports"
msgstr "监测远程端口"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr "名称"
diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 842d98c83..9ef36a587 100644
--- a/applications/luci-app-statistics/po/zh-tw/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
@@ -67,7 +67,7 @@ msgid "CPU Context Switches Plugin Configuration"
msgstr "CPU Context Switches 外掛配置"
#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
msgid "CPU Frequency"
msgstr "CPU 頻率"
@@ -262,6 +262,10 @@ msgstr "Exec"
msgid "Exec Plugin Configuration"
msgstr "Exec 外掛配置"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
msgid "Filter class monitoring"
msgstr "Filter 類監測"
@@ -481,6 +485,10 @@ msgstr "監測程序"
msgid "Monitor remote ports"
msgstr "監測遠端埠"
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
msgstr "名稱"
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index 429d4357d..cc38bd97e 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -71,19 +71,24 @@ o4 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"),
o4.default = o4.enabled
o4.rmempty = false
-o5 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
+o5 = s:option(Flag, "trm_autoadd", translate("Add Open Uplinks"),
+ translate("Automatically add open uplinks like hotel captive portals to your wireless config."))
+o5.default = o5.disabled
+o5.rmempty = false
+
+o6 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
translate("Name of the used uplink interface."))
if dump then
local i, v
for i, v in ipairs(dump.interface) do
if v.interface ~= "loopback" and v.interface ~= "lan" then
local device = v.l3_device or v.device or "-"
- o5:value(v.interface, v.interface.. " (" ..device.. ")")
+ o6:value(v.interface, v.interface.. " (" ..device.. ")")
end
end
end
-o5.default = trmiface
-o5.rmempty = false
+o6.default = trmiface
+o6.rmempty = false
-- Runtime information
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index 83011e9dd..e8580daac 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -1,9 +1,11 @@
--- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+-- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
local fs = require("nixio.fs")
local uci = require("luci.model.uci").cursor()
local http = require("luci.http")
+local util = require("luci.util")
+local scripts = util.split(util.trim(util.exec("ls /etc/travelmate/*.login 2>/dev/null")), "\n", nil, true) or {}
local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
local encr_psk = {"psk", "psk2", "psk-mixed"}
local encr_wpa = {"wpa", "wpa2", "wpa-mixed"}
@@ -135,6 +137,17 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
end
end
+local login_section = (m.hidden.ssid or "") .. (m.hidden.bssid or "")
+login_section = login_section:gsub("[^%w_]", "_")
+local cmd = uci:get("travelmate", login_section, "command")
+cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
+ translate("External script reference which will be called for automated captive portal logins."))
+cmd_list:value("none")
+for _, z in ipairs(scripts) do
+ cmd_list:value(z)
+end
+cmd_list.default = cmd or "none"
+
function wssid.write(self, section, value)
newsection = uci:section("wireless", "wifi-iface", nil, {
mode = "sta",
@@ -174,6 +187,16 @@ function wssid.write(self, section, value)
else
uci:set("wireless", newsection, "encryption", "none")
end
+ local login_section = (wssid:formvalue(section) or "") .. (bssid:formvalue(section) or "")
+ login_section = login_section:gsub("[^%w_]", "_")
+ if not uci:get("travelmate", login_section) and cmd_list:formvalue(section) ~= "none" then
+ uci:set("travelmate", login_section, "login")
+ end
+ if uci:get("travelmate", login_section) then
+ uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+ uci:save("travelmate")
+ uci:commit("travelmate")
+ end
uci:save("wireless")
uci:commit("wireless")
luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index dae358ae0..cd2fa69ae 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -1,9 +1,11 @@
-- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
-local http = require("luci.http")
+local fs = require("nixio.fs")
+local uci = require("luci.model.uci").cursor()
+local http = require("luci.http")
+local util = require("luci.util")
+local scripts = util.split(util.trim(util.exec("ls /etc/travelmate/*.login 2>/dev/null")), "\n", nil, true) or {}
m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration"))
m.submit = translate("Save")
@@ -19,6 +21,7 @@ m.hidden = {
}
local s = uci:get_all("wireless", m.hidden.cfg)
+
if s ~= nil then
wssid = m:field(Value, "ssid", translate("SSID"))
wssid.datatype = "rangelength(1,32)"
@@ -126,6 +129,17 @@ if s ~= nil then
wkey.password = true
wkey.default = s.key or s.password
end
+
+ local login_section = (s.ssid or "") .. (s.bssid or "")
+ login_section = login_section:gsub("[^%w_]", "_")
+ local cmd = uci:get("travelmate", login_section, "command")
+ cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
+ translate("External script reference which will be called for automated captive portal logins."))
+ cmd_list:value("none")
+ for _, z in ipairs(scripts) do
+ cmd_list:value(z)
+ end
+ cmd_list.default = cmd or "none"
else
m.on_cancel()
end
@@ -160,6 +174,16 @@ function wssid.write(self, section, value)
uci:set("wireless", m.hidden.cfg, "priv_key_pwd", privkeypwd:formvalue(section) or "")
end
end
+ local login_section = (wssid:formvalue(section) or "") .. (bssid:formvalue(section) or "")
+ login_section = login_section:gsub("[^%w_]", "_")
+ if not uci:get("travelmate", login_section) and cmd_list:formvalue(section) ~= "none" then
+ uci:set("travelmate", login_section, "login")
+ end
+ if uci:get("travelmate", login_section) then
+ uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+ uci:save("travelmate")
+ uci:commit("travelmate")
+ end
uci:save("wireless")
uci:commit("wireless")
luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index 0e78803d0..5c2896633 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -34,7 +34,7 @@ This is free software, licensed under the Apache License, Version 2.0
if (view)
{
view.setAttribute("name", "station_nok");
- view.setAttribute("style", "color: #a22; font-weight: bold");
+ view.setAttribute("style", "text-align: left !important; color: #a22; font-weight: bold");
}
}
}
@@ -59,7 +59,7 @@ This is free software, licensed under the Apache License, Version 2.0
view = document.getElementById(search);
if (view)
{
- view.setAttribute("style", "color: #37c; font-weight: bold");
+ view.setAttribute("style", "text-align: left !important; color: #37c; font-weight: bold");
}
}
}
@@ -122,10 +122,10 @@ This is free software, licensed under the Apache License, Version 2.0
local encr = s.encryption or "-"
-%>
<div class="tr cbi-section-table-row cbi-rowstyle-1" name="station_ok" id="1_<%=device%>/<%=ssid%>/<%=bssid%>">
- <div class="td left" name="station_ok" id="2_<%=device%>/<%=ssid%>/<%=bssid%>"><%=device%></div>
- <div class="td left" name="station_ok" id="3_<%=device%>/<%=ssid%>/<%=bssid%>"><%=ssid%></div>
- <div class="td left" name="station_ok" id="4_<%=device%>/<%=ssid%>/<%=bssid%>"><%=bssid%></div>
- <div class="td left" name="station_ok" id="5_<%=device%>/<%=ssid%>/<%=bssid%>"><%=encr%></div>
+ <div class="td left" style="text-align: left !important" name="station_ok" id="2_<%=device%>/<%=ssid%>/<%=bssid%>"><%=device%></div>
+ <div class="td left" style="text-align: left !important" name="station_ok" id="3_<%=device%>/<%=ssid%>/<%=bssid%>"><%=ssid%></div>
+ <div class="td left" style="text-align: left !important" name="station_ok" id="4_<%=device%>/<%=ssid%>/<%=bssid%>"><%=bssid%></div>
+ <div class="td left" style="text-align: left !important" name="station_ok" id="5_<%=device%>/<%=ssid%>/<%=bssid%>"><%=encr%></div>
<div class="td middle cbi-section-actions">
<div>
<input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>" />
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index 67568f179..86846a571 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -52,16 +52,16 @@ This is free software, licensed under the Apache License, Version 2.0
</div>
<%- for i, net in ipairs(iw.scanlist or { }) do -%>
<div class="tr cbi-section-table-row cbi-rowstyle-1">
- <div class="td left">
+ <div class="td left" style="text-align: left !important">
<%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
</div>
- <div class="td left">
+ <div class="td left" style="text-align: left !important">
<%=net.bssid and utl.pcdata(net.bssid)%>
</div>
- <div class="td left">
+ <div class="td left" style="text-align: left !important">
<%=format_wifi_encryption(net.encryption)%>
</div>
- <div class="td left">
+ <div class="td left" style="text-align: left !important">
<%=percent_wifi_signal(net)%> %
</div>
<div class="td cbi-section-actions">
diff --git a/applications/luci-app-travelmate/po/es/travelmate.po b/applications/luci-app-travelmate/po/es/travelmate.po
index 50e613e23..47203c079 100644
--- a/applications/luci-app-travelmate/po/es/travelmate.po
+++ b/applications/luci-app-travelmate/po/es/travelmate.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 23:10-0300\n"
+"PO-Revision-Date: 2019-09-17 22:49-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,15 +21,19 @@ 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 "Añadir enlaces ascendentes abiertos"
+
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
msgstr "Añadir enlace"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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 ""
@@ -40,19 +44,32 @@ msgstr ""
msgid "Advanced"
msgstr "Avanzado"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "Autenticación"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 "Script de inicio de sesión automático"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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 ""
+"Agregue automáticamente enlaces ascendentes abiertos como portales cautivos "
+"de hotel a su configuración inalámbrica."
+
+#: 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."
@@ -60,19 +77,19 @@ msgstr ""
"Restablece automáticamente la lista de 'Estaciones defectuosas' después de n "
"minutos. El valor predeterminado es '0', lo que significa que no caduca."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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."
@@ -89,10 +106,10 @@ msgstr ""
"Verifique la disponibilidad de Internet, registre las redirecciones del "
"portal cautivo y mantenga la conexión del enlace \"viva\"."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "Cifrado"
@@ -104,7 +121,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"
@@ -134,8 +151,8 @@ msgstr "Dispositivo"
msgid "Down"
msgstr "Abajo"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "Método EAP"
@@ -159,7 +176,7 @@ msgstr "Editar la configuración de Travelmate"
msgid "Edit Wireless Configuration"
msgstr "Editar la configuración del WiFi"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "Editar la configuración del enlace inalámbrico"
@@ -169,24 +186,33 @@ msgstr "Editar este enlace"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:54
msgid "Enable Travelmate"
-msgstr "Habilitar Travelmate"
+msgstr "Habilitar"
-#: 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"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "Encriptación"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+"Referencia de script externo que se llamará para inicios de sesión cautivos "
+"automatizados del portal."
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
msgstr "Opciones extra"
@@ -210,40 +236,40 @@ msgstr ""
"Para obtener más información <a href=\"%s\" target=\"_blank\">vea la "
"documentación en línea</a>"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "Forzar CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "Forzar TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
msgid "Force TKIP and CCMP (AES)"
-msgstr "Forzar TKIP and CCMP (AES)"
+msgstr "Forzar TKIP y 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 ""
"Cuánto tiempo debe esperar travelmate para una conexión de enlace wlan sea "
"exitosa."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "Identidad"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "Ignorar BSSID"
@@ -254,7 +280,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"
@@ -266,7 +292,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"
@@ -274,7 +300,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."
@@ -290,7 +316,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."
@@ -302,18 +328,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."
@@ -321,33 +347,33 @@ msgstr "Tiempo de espera de reintento global en segundos."
msgid "Overview"
msgstr "Visión general"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "Contraseña"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "Contraseña"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "Contraseña o clave privada"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "Ruta al certificado CA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "Ruta al certificado del cliente"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "Ruta a la clave privada"
@@ -374,7 +400,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"
@@ -391,7 +417,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')."
@@ -399,7 +425,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 ."
@@ -407,13 +433,13 @@ msgstr "Vuelva a intentar el límite para conectarse a un enlace ."
msgid "Runtime Information"
msgstr "Información de tiempo de ejecución"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID (oculto)"
@@ -421,8 +447,8 @@ msgstr "SSID (oculto)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "Guardar"
@@ -430,7 +456,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"
@@ -438,7 +464,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"
@@ -454,7 +480,7 @@ msgstr "ID de estación (RADIO/SSID/BSSID)"
msgid "Station Interface"
msgstr "Interfaz de estación"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
@@ -519,7 +545,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"
@@ -532,7 +558,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"
@@ -556,7 +582,7 @@ msgstr "Ver archivo de registro"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "Frase de contraseña WEP"
@@ -564,7 +590,7 @@ msgstr "Frase de contraseña WEP"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "Frase de contraseña WPA"
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index ade155c84..7a18b07f9 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,15 +21,19 @@ 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 "アップリンクの追加"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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 の処理が開始されるまでの、追加の遅延時間(秒)です。"
@@ -38,19 +42,32 @@ msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間
msgid "Advanced"
msgstr "詳細設定"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "認証"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 "自動ログイン スクリプト"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
@@ -58,19 +75,19 @@ msgstr ""
"'問題のあるステーション' リストを指定された時間(分)が経過後に自動的にリセッ"
"トします。デフォルトは期限切れとしないことを意味する '0' です。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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) です。"
@@ -86,10 +103,10 @@ msgstr ""
"インターネットの利用可否を確認し、キャプティブポータル リダイレクトを記録して"
"アップリンク接続を 'alive' として保持します。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "暗号化方式"
@@ -100,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 "接続制限"
@@ -131,8 +148,8 @@ msgstr "デバイス"
msgid "Down"
msgstr "下へ"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "EAP メソッド"
@@ -156,7 +173,7 @@ msgstr "Travelmate 設定の編集"
msgid "Edit Wireless Configuration"
msgstr "無線設定の編集"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "無線アップリンク設定の編集"
@@ -168,22 +185,31 @@ 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 "詳細なデバッグ ログの有効化"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "暗号化"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr "拡張オプション"
@@ -207,38 +233,38 @@ msgstr ""
"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
"確認してください。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 が無線アップリンクへの接続成功を待つ時間です。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "ID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "BSSID の無視"
@@ -249,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 "インターフェース タイムアウト"
@@ -261,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 "リストの自動期限切れ"
@@ -269,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."
@@ -285,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 "使用されるアップリンク インターフェースの名前です。"
@@ -297,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 "全体的な再試行タイムアウト(秒)です。"
@@ -314,33 +340,33 @@ msgstr "全体的な再試行タイムアウト(秒)です。"
msgid "Overview"
msgstr "概要"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "パスフレーズ"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "パスワード"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "秘密鍵のパスワード"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "CA 証明書へのパス"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "クライアント証明書へのパス"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "秘密鍵へのパス"
@@ -367,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 "無線の選択 / 順番"
@@ -384,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')."
@@ -392,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 "アップリンクへの接続を試行する回数です。"
@@ -400,13 +426,13 @@ msgstr "アップリンクへの接続を試行する回数です。"
msgid "Runtime Information"
msgstr "実行情報"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID(ステルス)"
@@ -414,8 +440,8 @@ msgstr "SSID(ステルス)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "保存"
@@ -423,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 "スキャンバッファー サイズ"
@@ -431,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 "シグナル品質閾値"
@@ -447,7 +473,7 @@ msgstr "ステーション ID (RADIO / SSID / BSSID)"
msgid "Station Interface"
msgstr "ステーション インターフェース"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
@@ -513,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 "トリガ遅延"
@@ -526,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 "アップリンク / トリガー インターフェース"
@@ -550,7 +576,7 @@ msgstr "ログファイルの確認"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "WEP パスフレーズ"
@@ -558,7 +584,7 @@ msgstr "WEP パスフレーズ"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "WPA パスフレーズ"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 3ad498c85..fd257abf4 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -21,15 +21,19 @@ 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"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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."
@@ -38,37 +42,48 @@ msgstr "Atraso adicional em segundos antes do travelmate processe os gatilhos."
msgid "Advanced"
msgstr "Avançado"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "Autenticação"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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 ""
@@ -84,10 +99,10 @@ msgstr ""
"Verificar a disponibilidade de internet, registrar encaminhamentos de "
"portais de autenticação e manter a conexão para fora 'viva'."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "Cifra"
@@ -99,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"
@@ -129,8 +144,8 @@ msgstr "Dispositivo"
msgid "Down"
msgstr "Abaixo"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "Método EAP"
@@ -154,7 +169,7 @@ msgstr "Editar Configurações do Travelmate"
msgid "Edit Wireless Configuration"
msgstr "Editar Configurações da Rede sem fio"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "Editar Configurações da Rede sem fio de saída"
@@ -166,22 +181,29 @@ 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"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "Cifragem"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr "Opções adicionais"
@@ -205,40 +227,40 @@ msgstr ""
"Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
"externa</a>"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "Forçar CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "Forçar TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 ""
"Quanto tempo o travelmate irá esperar pelo sucesso da conexão sem fio "
"externa."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "Identidade"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "Ignore o BSSID"
@@ -251,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"
@@ -263,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 ""
@@ -271,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."
@@ -287,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"
@@ -299,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."
@@ -318,33 +340,33 @@ msgstr "Estouro de tempo global em segundos."
msgid "Overview"
msgstr "Visão Geral"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "Senha"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "Senha"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "Senha da Chave Privada"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "Caminho para o Certificado da AC"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "Caminho para o Certificado do Cliente"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "Caminho para a Chave Privada"
@@ -369,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 ""
@@ -386,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."
@@ -400,13 +422,13 @@ msgstr "Limite de retentativa de conexão com um enlace externo."
msgid "Runtime Information"
msgstr "Informações Atuais"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID (oculto)"
@@ -414,8 +436,8 @@ msgstr "SSID (oculto)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "Salvar"
@@ -423,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 ""
@@ -431,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"
@@ -447,7 +469,7 @@ msgstr "Identificador da Estação (RADIO/SSID/BSSID)"
msgid "Station Interface"
msgstr "Interface da Estação"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr "O BSSID '%s' é opcional e somente necessário para redes ocultas"
@@ -502,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"
@@ -515,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"
@@ -539,7 +561,7 @@ msgstr "Visualizar o Arquivo de Registros (log)"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "WEP por Senha"
@@ -547,7 +569,7 @@ msgstr "WEP por Senha"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "WPA por Senha"
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index 9d694e09b..4f1508c09 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -24,15 +24,19 @@ 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 "Подключение к сети"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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."
@@ -41,37 +45,48 @@ msgstr "Дополнительная задержка в секундах до
msgid "Advanced"
msgstr "Дополнительно"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "Аутентификация"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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 ""
@@ -85,10 +100,10 @@ msgid ""
"the uplink connection 'alive'."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "Алгоритм шифрования"
@@ -98,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 "Ограничение соединений"
@@ -129,8 +144,8 @@ msgstr "Устройство"
msgid "Down"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "Метод EAP"
@@ -154,7 +169,7 @@ msgstr "Настройка config файла Travelmate"
msgid "Edit Wireless Configuration"
msgstr "Настройка config файл wireless"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "Редактировать настройки беспроводной сети"
@@ -166,22 +181,29 @@ 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 "Включить подробное ведение журнала отладки"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "Шифрование"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr "Дополнительные настройки"
@@ -205,38 +227,38 @@ msgstr ""
"Для получения дополнительной информации <a href=\"%s\" target=\"_blank\"> "
"смотрите онлайн документацию</a>."
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "Назначить CCMP (AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "Назначить TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "Идентификация EAP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "Игнорировать BSSID"
@@ -247,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 "Временная задержка интерфейса"
@@ -259,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 ""
@@ -267,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."
@@ -281,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 "Имя используемого интерфейса внешней сети."
@@ -293,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 ""
@@ -312,33 +334,33 @@ msgstr ""
msgid "Overview"
msgstr "Главное меню"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "Парольная фраза"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "Пароль"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "Пароль к Приватному ключу"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "Путь к CA-Сертификату"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "Путь к Client-Сертификату"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "Путь к Приватному ключу"
@@ -363,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 ""
@@ -380,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 ""
@@ -394,13 +416,13 @@ msgstr ""
msgid "Runtime Information"
msgstr "Информация о состоянии"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID (скрытый)"
@@ -408,8 +430,8 @@ msgstr "SSID (скрытый)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "Сохранить"
@@ -417,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 ""
@@ -425,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 ""
@@ -441,7 +463,7 @@ msgstr "ID (RADIO/SSID/BSSID) клиента"
msgid "Station Interface"
msgstr "Интерфейс клиента"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
@@ -505,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 ""
@@ -518,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 />внешней сети"
@@ -542,7 +564,7 @@ msgstr "Показать системный журнал"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "Пароль WEP"
@@ -550,7 +572,7 @@ msgstr "Пароль WEP"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "Пароль WPA"
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index 481c22fe9..01e70ba2a 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -10,15 +10,19 @@ 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 ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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 ""
@@ -27,37 +31,48 @@ msgstr ""
msgid "Advanced"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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 ""
@@ -71,10 +86,10 @@ msgid ""
"the uplink connection 'alive'."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr ""
@@ -84,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 ""
@@ -113,8 +128,8 @@ msgstr ""
msgid "Down"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr ""
@@ -138,7 +153,7 @@ msgstr ""
msgid "Edit Wireless Configuration"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr ""
@@ -150,22 +165,29 @@ 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 ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr ""
@@ -187,38 +209,38 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
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
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr ""
@@ -229,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 ""
@@ -241,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 ""
@@ -249,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."
@@ -263,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 ""
@@ -275,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 ""
@@ -292,33 +314,33 @@ msgstr ""
msgid "Overview"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr ""
@@ -339,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 ""
@@ -356,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 ""
@@ -370,13 +392,13 @@ msgstr ""
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr ""
@@ -384,8 +406,8 @@ msgstr ""
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr ""
@@ -393,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 ""
@@ -401,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 ""
@@ -417,7 +439,7 @@ msgstr ""
msgid "Station Interface"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
@@ -471,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 ""
@@ -484,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 ""
@@ -508,7 +530,7 @@ msgstr ""
msgid "WEP"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr ""
@@ -516,7 +538,7 @@ msgstr ""
msgid "WPA"
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr ""
diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
index 53147d279..de86739de 100644
--- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
@@ -24,15 +24,19 @@ 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 "添加上行连接"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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 处理开始前的额外触发延迟(秒)。"
@@ -41,37 +45,48 @@ msgstr "在 travelmate 处理开始前的额外触发延迟(秒)。"
msgid "Advanced"
msgstr "高级"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "认证"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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 ""
@@ -85,10 +100,10 @@ msgid ""
"the uplink connection 'alive'."
msgstr "检查互联网可用性,记录强制网络门户重定向,并保持上行连接为“活动”状态。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "密码"
@@ -98,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 "连接限制"
@@ -127,8 +142,8 @@ msgstr "设备"
msgid "Down"
msgstr "下"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "EAP-方法"
@@ -152,7 +167,7 @@ msgstr "编辑 Travelmate 配置"
msgid "Edit Wireless Configuration"
msgstr "编辑无线配置"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "编辑无线上行连接配置"
@@ -164,22 +179,29 @@ 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 "启用详细调试日志"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "加密"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr "额外选项"
@@ -201,38 +223,38 @@ msgid ""
"documentation</a>"
msgstr "有关详细信息,请<a href=\"%s\" target=\"_blank\">查看在线文档</a>"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "强制 CCMP(AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "强制 TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 上行连接成功最长时间。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "身份"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "忽略 BSSID"
@@ -243,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 "接口超时"
@@ -255,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 ""
@@ -263,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."
@@ -277,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 "要使用的上行连接接口名称。"
@@ -289,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 "总体重试超时(秒)。"
@@ -306,33 +328,33 @@ msgstr "总体重试超时(秒)。"
msgid "Overview"
msgstr "概述"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "密码"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "密码"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "私钥密码"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "CA 证书路径"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "客户证书路径"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "私钥路径"
@@ -355,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 "无线电选择/顺序"
@@ -372,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')."
@@ -380,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 "连接到上行连接的重试限制。"
@@ -388,13 +410,13 @@ msgstr "连接到上行连接的重试限制。"
msgid "Runtime Information"
msgstr "运行信息"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID(隐藏)"
@@ -402,8 +424,8 @@ msgstr "SSID(隐藏)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "保存"
@@ -411,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 ""
@@ -419,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 "信号质量阈值"
@@ -435,7 +457,7 @@ msgstr "站点 ID(RADIO/SSID/BSSID)"
msgid "Station Interface"
msgstr "站点接口"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr "BSSID 信息“%s”是可选的,仅对隐藏网络必需"
@@ -489,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 "触发延迟"
@@ -502,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 "上行 / 触发接口"
@@ -526,7 +548,7 @@ msgstr "查看日志文件"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "WEP-口令"
@@ -534,7 +556,7 @@ msgstr "WEP-口令"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "WPA-口令"
diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
index 3c373fb15..583e338dc 100644
--- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
@@ -24,15 +24,19 @@ 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 "新增上行連線"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
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 處理開始前的額外觸發延遲(秒)。"
@@ -41,37 +45,48 @@ msgstr "在 travelmate 處理開始前的額外觸發延遲(秒)。"
msgid "Advanced"
msgstr "高階"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
msgid "Authentication"
msgstr "認證"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: 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 ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
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."
msgstr ""
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
msgid "BSSID"
msgstr "BSSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
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 ""
@@ -86,10 +101,10 @@ msgid ""
msgstr ""
"檢查網際網路可用性,記錄強制網路門戶重定向,並保持上行連線為“活動”狀態。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
msgid "Cipher"
msgstr "密碼"
@@ -99,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 "連線限制"
@@ -128,8 +143,8 @@ msgstr "裝置"
msgid "Down"
msgstr "下"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
msgid "EAP-Method"
msgstr "EAP-方法"
@@ -153,7 +168,7 @@ msgstr "編輯 Travelmate 配置"
msgid "Edit Wireless Configuration"
msgstr "編輯無線配置"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
msgid "Edit Wireless Uplink Configuration"
msgstr "編輯無線上行連線配置"
@@ -165,22 +180,29 @@ 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 "啟用詳細除錯日誌"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
msgid "Encryption"
msgstr "加密"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+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:100
msgid "Extra Options"
msgstr "額外選項"
@@ -202,38 +224,38 @@ msgid ""
"documentation</a>"
msgstr "有關詳細資訊,請<a href=\"%s\" target=\"_blank\">檢視線上文件</a>"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
msgid "Force CCMP (AES)"
msgstr "強制 CCMP(AES)"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
msgid "Force TKIP"
msgstr "強制 TKIP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
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 上行連線成功最長時間。"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
msgid "Identity"
msgstr "身份"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
msgid "Ignore BSSID"
msgstr "忽略 BSSID"
@@ -244,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 "介面超時"
@@ -256,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 ""
@@ -264,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."
@@ -278,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 "要使用的上行連線介面名稱。"
@@ -290,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 "總體重試超時(秒)。"
@@ -307,33 +329,33 @@ msgstr "總體重試超時(秒)。"
msgid "Overview"
msgstr "概述"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
msgid "Passphrase"
msgstr "密碼"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
msgid "Password"
msgstr "密碼"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
msgid "Password of Private Key"
msgstr "私鑰密碼"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
msgid "Path to CA-Certificate"
msgstr "CA 證書路徑"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
msgid "Path to Client-Certificate"
msgstr "客戶證書路徑"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
msgid "Path to Private Key"
msgstr "私鑰路徑"
@@ -356,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 "無線電選擇/順序"
@@ -373,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')."
@@ -381,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 "連線到上行連線的重試限制。"
@@ -389,13 +411,13 @@ msgstr "連線到上行連線的重試限制。"
msgid "Runtime Information"
msgstr "執行資訊"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
msgid "SSID"
msgstr "SSID"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
msgid "SSID (hidden)"
msgstr "SSID(隱藏)"
@@ -403,8 +425,8 @@ msgstr "SSID(隱藏)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
msgid "Save"
msgstr "儲存"
@@ -412,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 ""
@@ -420,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 "訊號質量閾值"
@@ -436,7 +458,7 @@ msgstr "站點 ID(RADIO/SSID/BSSID)"
msgid "Station Interface"
msgstr "站點介面"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr "BSSID 資訊“%s”是可選的,僅對隱藏網路必需"
@@ -490,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 "觸發延遲"
@@ -503,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 "上行 / 觸發介面"
@@ -527,7 +549,7 @@ msgstr "檢視日誌檔案"
msgid "WEP"
msgstr "WEP"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
msgid "WEP-Passphrase"
msgstr "WEP-口令"
@@ -535,7 +557,7 @@ msgstr "WEP-口令"
msgid "WPA"
msgstr "WPA"
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
msgid "WPA-Passphrase"
msgstr "WPA-口令"
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
index 60d0477d5..d1ea77408 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
@@ -17,6 +17,8 @@ local ht = require "luci.http"
local ds = require "luci.dispatcher"
local ucl = luci.model.uci.cursor()
local valman = ucl:get_first("unbound", "unbound", "manual_conf")
+local dhcplk = ucl:get_first("unbound", "unbound", "dhcp_link")
+local lstrig = ucl:get_first("dhcp", "odhcpd", "leasetrigger")
m1 = Map("unbound")
s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
@@ -29,6 +31,12 @@ s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
s1.addremove = false
s1.anonymous = true
+if (valman == "0") and (dhcplk == "odhcpd") and (lstrig ~= "/usr/lib/unbound/odhcpd.sh") then
+ m1.message = translatef( "Note: local DNS is configured to look at odhpcd, "
+ .. "but odhpcd UCI lease trigger is incorrectly set: ")
+ .. "dhcp.odhcpd.leasetrigger='" .. lstrig .. "'"
+end
+
--LuCI, Unbound, or Not
s1:tab("basic", translate("Basic"))
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index f426acc53..2e26a5158 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 ed6f4f4da..56221e043 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 6545154c2..95971fab1 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
diff --git a/applications/luci-app-vpnbypass/po/de/vpnbypass.po b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
index 635d9987c..a686c3238 100644
--- a/applications/luci-app-vpnbypass/po/de/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
@@ -1,20 +1,24 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Zu umgehende Domains"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
"Domains die direkt erreicht werden sollen (außerhalb des VPN Tunnel), siehe"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Zu umgehende lokale IP Adressen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -22,23 +26,23 @@ msgstr ""
"Lokale IP Adressen, oder Subnetze mit direktem Internet-Zugriff (außerhalb "
"des VPN Tunnel)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Zu umgehende Lokale Ports"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Lokale Ports um VPN Bypass anzustoßen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Zu umgehende entfernte IP Adressen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -46,26 +50,46 @@ msgstr ""
"Entfernte IP Adressen, oder Subnetze mit direktem Internet-Zugriff "
"(außerhalb des VPN Tunnel)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Zu umgehende entfernte Ports"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Enfernte Ports um VPN Bypass anzustßen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Starte VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr ""
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN Bypass Einstellungen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "für Syntax"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Starte VPNBypass service"
diff --git a/applications/luci-app-vpnbypass/po/es/vpnbypass.po b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
index 9fdbcacb5..ad077f0b7 100644
--- a/applications/luci-app-vpnbypass/po/es/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
@@ -3,30 +3,34 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:51-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamin@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Dominios a omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
"Dominios a los que se puede acceder directamente (fuera del túnel VPN), "
"consulte"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr "Habilitar/Iniciar"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Direcciones IP locales para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -34,23 +38,23 @@ msgstr ""
"Direcciones IP o subredes locales con acceso directo a Internet (fuera del "
"túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Puertos locales para evitar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Puertos locales para activar VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "LÉEME"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Direcciones IP remotas para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -58,26 +62,46 @@ msgstr ""
"Direcciones IP remotas o subredes a las que se accederá directamente (fuera "
"del túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Puertos remotos para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Puertos remotos para activar VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Iniciar el servicio VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr "Estado del servicio"
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr "El servicio está deshabilitado/detenido"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr "El servicio está habilitado/iniciado"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr "Detener/Deshabilitar"
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN Bypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr "Reglas de VPN Bypass"
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Configuración de VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "para la sintaxis"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Iniciar el servicio VPNBypass"
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index da254e53b..ba4cc890a 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -12,42 +12,46 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Domínios para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "Domínios para serem acessados diretamente (fora do túnel VPN), veja"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Endereço IP Local para Contornar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr ""
"Endereço IP Local ou subrede com acesso direto à internet (fora do túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Portas locais para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Portas locais para disparar o VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "LEIAME"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Endereço IP Remoto para Contornar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -55,30 +59,50 @@ msgstr ""
"Endereço IP Remoto ou subrede que serão acessados diretamente (fora do túnel "
"VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Portas remotas para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Portas remotas para disparar o VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Inicie o serviço VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN Bypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Configurações do VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "para sintaxe"
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Inicie o serviço VPNBypass"
+
#~ msgid "Enable VPN Bypass"
#~ msgstr "Habilitar o VPN Bypass"
diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
index e924cfe50..eca6fec32 100644
--- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
@@ -15,19 +15,23 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Домены, для<br />обхода блокировки"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Локальный IP-адрес<br />обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -35,23 +39,23 @@ msgstr ""
"Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-"
"туннеля)."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Локальные порты для запуска обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Локальные порты<br />для обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "Описание"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Удаленные IP-адреса<br />обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -59,27 +63,44 @@ msgstr ""
"Удаленные IP-адреса или подсети, которые будут доступны напрямую (вне "
"туннеля VPN)."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Удаленные порты<br />для обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Удаленные порты для запуска обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "Обход VPN"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Настройка обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "для синтаксиса"
diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
index 7a9b05327..06b01d405 100644
--- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
+++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
@@ -1,66 +1,87 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr ""
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr ""
diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
index 3003cf382..a986ee241 100644
--- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
@@ -11,69 +11,93 @@ msgstr ""
"PO-Revision-Date: 2018-08-07 20:19+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "要绕过的域"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "要直接访问的域(不使用 VPN 隧道),请参见"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "要绕过的本地 IP 地址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr "直接访问的本地 IP 地址或子网(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "要绕过的本地端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "触发 VPN 绕过的本地端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "README"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "要绕过的远程 IP 地址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr "将直接访问的远程 IP 地址或子网(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "要绕过的远程端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "触发 VPN 绕过的远程端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "启动 VPNBypass 服务"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN 绕过"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN 绕过设置"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "对于语法"
+#~ msgid "Start VPNBypass service"
+#~ msgstr "启动 VPNBypass 服务"
+
#~ msgid "Enable/start service"
#~ msgstr "启用/启动服务"
diff --git a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
index 1d43363fc..971d5e4ed 100644
--- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
@@ -11,67 +11,88 @@ msgstr ""
"PO-Revision-Date: 2017-10-29 15:30+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "要繞過的域"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "要直接訪問的域(不使用 VPN 隧道),請參見"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "要繞過的本地 IP 位址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr "直接訪問的本地 IP 位址或子網(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "要繞過的本地埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "觸發 VPN 繞過的本地埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "README"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "要繞過的遠端 IP 位址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr "將直接訪問的遠端 IP 位址或子網(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "要繞過的遠端埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "觸發 VPN 繞過的遠端埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN 繞過"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN 繞過設定"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "對於語法"
diff --git a/applications/luci-app-wifischedule/po/es/wifischedule.po b/applications/luci-app-wifischedule/po/es/wifischedule.po
index 03e0fccd0..5aeb5eb7d 100644
--- a/applications/luci-app-wifischedule/po/es/wifischedule.po
+++ b/applications/luci-app-wifischedule/po/es/wifischedule.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:54-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -139,7 +139,7 @@ msgstr "Miércoles"
#: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:26
#: applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua:39
msgid "Wifi Schedule"
-msgstr "Programar WiFi"
+msgstr "Horario de WiFi"
#: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:35
msgid "Wifi Schedule Logfile"
diff --git a/applications/luci-app-wireguard/po/es/wireguard.po b/applications/luci-app-wireguard/po/es/wireguard.po
index e1ef4c661..7a7ccaf6a 100644
--- a/applications/luci-app-wireguard/po/es/wireguard.po
+++ b/applications/luci-app-wireguard/po/es/wireguard.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 21:49-0300\n"
+"PO-Revision-Date: 2019-09-17 22:55-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -55,7 +55,7 @@ msgstr "Último Handshake"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
-msgstr "Escuchar puerto"
+msgstr "Puerto"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"