summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorINAGAKI Hiroshi <musashino.open@gmail.com>2019-07-27 02:30:20 +0900
committerINAGAKI Hiroshi <musashino.open@gmail.com>2019-07-27 02:30:20 +0900
commitbe275fd42a33653acdb4bd4604f4a9ec6b463da0 (patch)
treed49349c45924d36cc091bb8eb21846b5d99a5b6a /applications
parent16f23de9779908850f756d62c2550b354c97e0f7 (diff)
i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-firewall/po/ca/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/cs/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/de/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/el/firewall.po470
-rw-r--r--applications/luci-app-firewall/po/en/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/es/firewall.po475
-rw-r--r--applications/luci-app-firewall/po/fr/firewall.po470
-rw-r--r--applications/luci-app-firewall/po/he/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/hu/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/it/firewall.po469
-rw-r--r--applications/luci-app-firewall/po/ja/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/ko/firewall.po469
-rw-r--r--applications/luci-app-firewall/po/ms/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/no/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/pl/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/pt-br/firewall.po475
-rw-r--r--applications/luci-app-firewall/po/pt/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/ro/firewall.po470
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/sk/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/sv/firewall.po470
-rw-r--r--applications/luci-app-firewall/po/templates/firewall.pot467
-rw-r--r--applications/luci-app-firewall/po/tr/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po472
-rw-r--r--applications/luci-app-firewall/po/vi/firewall.po467
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po475
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po475
-rw-r--r--applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po26
-rw-r--r--applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot22
-rw-r--r--applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po26
-rw-r--r--applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po26
-rw-r--r--applications/luci-app-nut/po/es/nut.po6
-rw-r--r--applications/luci-app-olsr-viz/po/es/olsr-viz.po3
-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.po50
-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-wireguard/po/de/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/es/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/ja/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/pt-br/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/ru/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/sv/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/templates/wireguard.pot63
-rw-r--r--applications/luci-app-wireguard/po/zh-cn/wireguard.po63
-rw-r--r--applications/luci-app-wireguard/po/zh-tw/wireguard.po63
68 files changed, 8688 insertions, 5995 deletions
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index e05ebf1f0..abb27d8b0 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -15,50 +15,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s amb %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> paquets al <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> i limita a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Acció"
@@ -74,33 +74,75 @@ msgstr "Afegeix"
msgid "Add and edit..."
msgstr "Afegeix i edita..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Ajusts avançats"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Qualsevol"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Xarxes cobertes"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Regles personalitzades"
@@ -116,15 +158,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Adreça de destí"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Port de destí"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -134,72 +176,82 @@ msgstr "Zona de destí"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Descarta els paquets invàlids"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilita"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Habilita protecció contra la inundació SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Adreça IP extern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -209,11 +261,23 @@ msgstr "Port extern"
msgid "External zone"
msgstr "Zona extern"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Paràmetres extres"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Tallafocs"
@@ -222,71 +286,71 @@ msgstr "Tallafocs"
msgid "Firewall - Custom Rules"
msgstr "Tallafocs - Regles personalitzades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Tallafocs - Reenviaments de port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Tallafocs - Regles de tràfic"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Tallafocs - Ajusts de zona"
-#: 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:204
msgid "Force connection tracking"
msgstr "Força el rastreig de connexió"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Reenvia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Reenvia a"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Des de %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Des de %s en %s amb origen %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Des de %s en %s amb orígens %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Ajusts generals"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -305,47 +369,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Només IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Només IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adreça IP interna"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port intern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limita els missatges de registre"
@@ -359,24 +427,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "Fixació MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Mascarada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Coincideix"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Coincideix amb el tipus ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -384,18 +452,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -429,19 +497,19 @@ msgstr "Nou reenviament de port"
msgid "New source NAT"
msgstr "Nou origen NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -458,26 +526,31 @@ msgstr "Obre els ports en el encaminador"
msgid "Other..."
msgstr "Altre..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Sortida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -485,38 +558,44 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -524,20 +603,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
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:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -549,64 +628,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Adreça IP d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Adreça MAC d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Adreça d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Port d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -614,8 +693,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -631,7 +710,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -647,31 +726,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "A %s a %s en <var>aquest dispositiu</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "A %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "A %s en <var>aquest dispositiu</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
@@ -683,12 +762,12 @@ msgstr "A l'IP d'origen"
msgid "To source port"
msgstr "Al port d'origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -698,109 +777,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Via %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenviaments"
-#: 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:78
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "accepta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "qualsevol"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "qualsevol host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualsevol zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "no rastregis"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "descarta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -822,13 +913,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "rebutja"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -855,9 +946,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Adreça IP de destí"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Reenviament interzonal"
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index b73fa704c..dfe7c5bc9 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -11,50 +11,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s v %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s s %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s v %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> paketů za <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> paketů za <var>%s</var>, burst <var>%d</var> paketů."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> a omezit na %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Akce"
@@ -70,33 +70,75 @@ msgstr "Přidat"
msgid "Add and edit..."
msgstr "Přidat a upravit"
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Pokročilé nastavení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Libovolné"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Pokryté sítě"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Vlastní pravidla"
@@ -111,15 +153,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Cílová adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Cílový port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -129,72 +171,82 @@ msgstr "Cílová oblast"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Zahazovat neplatné pakety"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Povolit"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Povolit NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Povolit ochranu proti SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Vnější IP adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -204,11 +256,23 @@ msgstr "Vnější port"
msgid "External zone"
msgstr "Vnější zóna"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Dodatečné argumenty"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -217,71 +281,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Vlastní pravidla"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Přesměrování portů"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Pravidla síťového provozu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Nastavení zón"
-#: 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:204
msgid "Force connection tracking"
msgstr "Vynutit sledování připojení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Přesměrování"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Přesměrovat na"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Z %s v %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Z %s v %s se zdrojovou %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Z %s v %s se zdrojovou %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Obecné nastavení"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -300,47 +364,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 a IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "pouze IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "pouze IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Vstup"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Vnitřní IP adresa"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Vnitřní port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Vnitřní zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Omezit logovací zprávy"
@@ -354,24 +422,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Maškárádování"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Shoda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Odpovídá ICMP typu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -379,18 +447,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -424,19 +492,19 @@ msgstr "Nové přesměrování portu"
msgid "New source NAT"
msgstr "Nový zdrojový NAT (SNAT)"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -453,26 +521,31 @@ msgstr "Otevřené porty na routeru"
msgid "Other..."
msgstr "Ostatní ..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Výstup"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -481,39 +554,45 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
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."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -521,20 +600,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Omezit na rodinu adres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -546,64 +625,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Zdrojová IP adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Zdrojová MAC adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Zdrojová adresa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Zdrojový port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zdrojová zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -611,8 +690,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -628,7 +707,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -643,31 +722,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Na %s v %s na <var>tomto zařízení</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Na %s v %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Na %s na <var>tomto zařízení</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Na %s, %s v %s"
@@ -679,12 +758,12 @@ msgstr "Na zdrojovou IP"
msgid "To source port"
msgstr "Na zdrojový port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -694,109 +773,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Prostřednictvím %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Přesměrování"
-#: 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:78
msgid "Zones"
msgstr "Zóny"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "přijmout"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "libovolný"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "libovolný hostitel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "libovolná zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "nesledovat"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "zahodit"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -818,13 +909,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "odmítnout"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -851,9 +942,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Cílová IP adresa"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
# nebo mimo zóny?
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Přesměrování mezi zónami"
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 9885c321e..ba09ba196 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s mit %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> Pkte. pro <var>%s</var>, Häufung <var>%d</var> Pkte."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> und limitieren auf %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Aktion"
@@ -72,33 +72,75 @@ msgstr "Hinzufügen"
msgid "Add and edit..."
msgstr "Hinzufügen und bearbeiten..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "beliebig"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Abgedeckte Netzwerke"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Benutzerdefinierte Regeln"
@@ -114,15 +156,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Zieladresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Zielport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -132,72 +174,82 @@ msgstr "Ziel-Zone"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Ungültige Pakete verwerfen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "NAT-Loopback aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Schutz vor SYN-flood-Attacken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Protokollierung innerhalb der Zone aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
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/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Externe IP-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -207,11 +259,23 @@ msgstr "Externer Port"
msgid "External zone"
msgstr "Externe Zone"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Zusätzliche Argumente"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -220,71 +284,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Benutzerdefinierte Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Portweiterleitungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Verkehrsregeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Zoneneinstellungen"
-#: 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:204
msgid "Force connection tracking"
msgstr "Connectiontracking erzwingen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Weitergeleitet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Weiterleiten an"
-#: 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:347
msgid "Friday"
msgstr "Freitag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Von %s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Von %s in %s mit Quell-%s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Von %s in %s mit Quell-%s und %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Allgemein"
-#: 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:71
msgid "Hardware flow offloading"
msgstr "Hardwarebeschleunigte Flusskontrolle"
@@ -303,47 +367,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 und IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "nur IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "nur IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Eingang"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Interne IP-Adresse"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Interner Port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Interne Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Protokollnachrichten limitieren"
@@ -357,24 +425,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "MSS Korrektur"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "NAT aktivieren"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Filter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Nach ICMP-Typ filtern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -382,18 +450,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Montag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Monatstage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -427,19 +495,19 @@ msgstr "Neue Portweiterleitung"
msgid "New source NAT"
msgstr "Neues SNAT"
-#: 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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -454,28 +522,33 @@ msgstr "Ports auf dem Router öffnen"
msgid "Other..."
msgstr "Anderes..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Ausgang"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -483,40 +556,46 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)"
@@ -525,20 +604,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Beschränke auf Adressfamilie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT-Beschleunigung"
@@ -550,64 +629,64 @@ msgstr "Regel ist deaktiviert"
msgid "Rule is enabled"
msgstr "Regel ist aktiviert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Samstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
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:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "Beschleunigte Flusskontrolle"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Quell-IP-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Quell-MAC-Adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Quelladresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Quellport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Quell-Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (JJJJ-MM-TT)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Enddatum (JJJJ-MM-TT)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Sonntag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -615,8 +694,8 @@ msgstr ""
"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
"den Netzverkehr zu trennen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -634,7 +713,7 @@ msgstr ""
"<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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -650,31 +729,31 @@ msgstr ""
"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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Donnerstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Zeit ist UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Zu %s an %s auf <var>diesem Gerät</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Zu %s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Zu %s auf <var>diesem Gerät</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Zu %s, %s in %s"
@@ -686,12 +765,12 @@ msgstr "Zu Quell-IP"
msgid "To source port"
msgstr "Zu Quell-Port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Verkehrsregeln"
-#: 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 ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -701,111 +780,123 @@ msgstr ""
"zum Beispiel um Verkehr 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Dienstag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "Unbenannte Portweiterleitung"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
msgstr "Unbennante Regel"
-#: 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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Über %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Über %s an %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Mittwoch"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Wochentage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Weiterleitungen"
-#: 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:78
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:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "zulassen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "beliebig"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "beliebiger Rechner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "beliebige Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "nicht verfolgen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "verwerfen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -827,13 +918,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "zurückweisen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -860,9 +951,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Ziel IP-Adresse"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Weiterleitungen zwischen Zonen"
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index a8472430d..36e2e3a36 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s με %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> πκτ. ανά <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Ενέργεια"
@@ -72,33 +72,75 @@ msgstr "Προσθήκη"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Ρυθμίσεις για προχωρημένους"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Προσαρμοσμένοι Κανόνες"
@@ -110,15 +152,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Διεύθυνση προορισμού"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Θύρα προορισμού"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
#, fuzzy
@@ -129,73 +171,83 @@ msgstr "Ζώνη προορισμού"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Αγνόηση μη-έγκυρων πακετών"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Ενεργοποίηση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
#, fuzzy
msgid "Enable SYN-flood protection"
msgstr "Προστασία SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Εξωτερική διεύθυνση IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -205,11 +257,23 @@ msgstr "Εξωτερική θύρα"
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Επιπλέον παράμετροι"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Τείχος προστασίας"
@@ -218,71 +282,71 @@ msgstr "Τείχος προστασίας"
msgid "Firewall - Custom Rules"
msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Τείχος προστασίας - Προώθηση Θυρών"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "Επιβολή παρακολούθησης σύνδεσης"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Προώθηση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Απο %s στο %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -301,49 +365,53 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 και IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Μόνο IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Μόνο IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Είσοδος"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
#, fuzzy
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
#, fuzzy
msgid "Internal port"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Εσωτερική ζώνη"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Περιορισμός καταγραφών συστήματος"
@@ -357,42 +425,42 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
#, fuzzy
msgid "MSS clamping"
msgstr "Περιορισμός MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -426,19 +494,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -453,63 +521,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "Έξοδος"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Πρωτόκολλο"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -517,20 +596,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -542,67 +621,67 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
#, fuzzy
msgid "Source IP address"
msgstr "Διεύθυνση MAC πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
#, fuzzy
msgid "Source address"
msgstr "Διεύθυνση MAC πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Θύρα πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
#, fuzzy
msgid "Source zone"
msgstr "Θύρα πηγής"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -610,8 +689,8 @@ msgstr ""
"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
"ελέγχει την δικτυακή κίνηση."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -621,7 +700,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -630,31 +709,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -666,121 +745,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Ζώνες"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "αποδοχή"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "αγνόηση"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -802,13 +893,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "απόρριψη"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -825,6 +916,3 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Διεύθυνση IP προορισμού"
-
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index f7c91820b..645560ca7 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -11,50 +11,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Action"
@@ -70,33 +70,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -108,15 +150,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Destination address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Destination port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -126,72 +168,82 @@ msgstr "Destination zone"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Drop invalid packets"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Enable SYN-flood protection"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -201,11 +253,23 @@ msgstr "External port"
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -218,71 +282,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Forward"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -301,47 +365,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr "Input"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Internal IP address"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Internal port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -355,24 +423,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Masquerading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -380,18 +448,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -425,19 +493,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -452,64 +520,75 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirect matched incoming traffic to the specified internal host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -517,20 +596,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -542,15 +621,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
@@ -584,52 +663,52 @@ msgstr ""
# msgid "Protocol"
# msgstr ""
#
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Source IP address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Source address"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Source port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Source zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -637,8 +716,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -648,7 +727,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -657,31 +736,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -693,121 +772,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "accept"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "any"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "drop"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -829,13 +920,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "reject"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index e79912f96..7db11e386 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -13,51 +13,51 @@ msgstr ""
"X-Generator: Poedit 2.2.3\n"
"Language-Team: \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:145
msgid "%s in %s"
msgstr "%s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s con %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> paquetes por <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
"<var>%d</var> paquetes por <var>%s</var>, máximo <var>%d</var> paquetes."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> y limitar a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "Aceptar reenvío"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "Aceptar entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "Aceptar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Acción"
@@ -73,33 +73,75 @@ msgstr "Añadir"
msgid "Add and edit..."
msgstr "Añadir y editar..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Configuración avanzada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Cualquiera"
-#: 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:344
+#: 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
msgid "Any day"
msgstr "Cualquier día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Redes cubiertas"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Reglas personalizadas"
@@ -115,15 +157,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Dirección de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Puerto de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -133,72 +175,82 @@ msgstr "Zona de destino"
msgid "Disable"
msgstr "Deshabilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "Descartar reenvío"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "Descartar entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "Descartar salida"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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 reescribir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:288
+#: 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"
msgstr "No seguir reenvío"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "No seguir entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "No seguir salida"
-#: 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:42
msgid "Drop invalid packets"
msgstr "Descartar paquetes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Habilitar bucle NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Habilitar protección contra inundaciones SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Habilitar registro en esta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
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/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Dirección IP externa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -208,11 +260,23 @@ msgstr "Puerto externo"
msgid "External zone"
msgstr "Zona externa"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Parámetros extra"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -221,71 +285,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reglas personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Reenvíos de puertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Reglas de tráfico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configuración de la zona"
-#: 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:204
msgid "Force connection tracking"
msgstr "Forzar seguimiento de conexión"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Reenviar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Reenviar a"
-#: 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:347
msgid "Friday"
msgstr "Viernes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Desde %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Desde %s en %s con origen %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Desde %s en %s con origen %s y %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "Desde %s en <var>este dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "Desde %s en <var>este dispositivo</var> con la fuente %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Configuración general"
-#: 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:71
msgid "Hardware flow offloading"
msgstr "Flow Offloading por hardware"
@@ -304,47 +368,51 @@ msgstr "Rango de IP"
msgid "IPs"
msgstr "IPs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Sólo IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Sólo IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Dirección IP interna"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Puerto interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limitar registro de mensajes"
@@ -358,24 +426,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: 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:132
msgid "MSS clamping"
msgstr "Fijado de MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Enmascaramiento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Coincidir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Coincidir con tipo ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -383,18 +451,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Lunes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Días del mes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -428,19 +496,19 @@ msgstr "Nuevo reenvío de puerto"
msgid "New source NAT"
msgstr "Nuevo origen NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -457,26 +525,31 @@ msgstr "Abrir puertos en el router"
msgid "Other..."
msgstr "Otros..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "Zona de salida"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -484,41 +557,47 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
"Redirigir el tráfico de entrada que coincida al host interno especificado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "Rechazar reenvío"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "Rechazar entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "Rechazar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Requiere soporte de NAT por hardware. Implementado al menos para mt7621"
@@ -527,20 +606,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Reiniciar Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Restringir a la familia de direcciones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Enrutamiento/NAT Offloading"
@@ -552,64 +631,64 @@ msgstr "Regla deshabilitada"
msgid "Rule is enabled"
msgstr "Regla habilitada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Sábado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
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:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "Flow Offloading por software"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Dirección IP origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Dirección MAC origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Dirección de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Puerto de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona de origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
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:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
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:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
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:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
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:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Domingo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -617,8 +696,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -635,7 +714,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -650,31 +729,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Jueves"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr "Restricciones de tiempo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Tiempo en UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "A %s en %s por <var>este dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "A %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "A %s por <var>este dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
@@ -686,12 +765,12 @@ msgstr "A IP origen"
msgid "To source port"
msgstr "A puerto origen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -701,109 +780,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Martes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "Reenvío sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
msgstr "Regla sin nombre"
-#: 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:99
msgid "Unnamed zone"
msgstr "Zona sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Vía %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Vía %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Miércoles"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Días de la semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenvíos"
-#: 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:78
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "Aceptar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "cualquiera"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "cualquier host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "cualquier zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "Día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "No seguir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "Descartar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "Hora"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "Minuto"
@@ -825,13 +916,13 @@ msgstr "Puerto"
msgid "ports"
msgstr "Puertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "Rechazar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "segundo"
@@ -846,6 +937,9 @@ msgstr "Tipo"
msgid "types"
msgstr "Tipos"
+#~ msgid "Output zone"
+#~ msgstr "Zona de salida"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada sin nombre)"
@@ -858,9 +952,6 @@ msgstr "Tipos"
#~ msgid "Destination IP address"
#~ msgstr "Dirección IP destino"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Reenvío entre zonas"
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 6aa925759..74af37802 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Action"
@@ -72,33 +72,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Paramètres avancés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "N'importe lequel"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Réseaux couverts"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Régles spécifiques"
@@ -110,15 +152,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Adresse de destination"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Port de destination"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -128,72 +170,82 @@ msgstr "Zone de destination"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Supprimer les paquets invalides"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Activer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Activer le NAT sur la boucle-locale"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
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:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Adresse IP externe"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -203,11 +255,23 @@ msgstr "Port externe"
msgid "External zone"
msgstr "Zone externe"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -220,71 +284,71 @@ 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:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Pare-feu -- Redirections de ports"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Pare-feu -- Règles de trafic"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Pare-feu - Configuration des zones"
-#: 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:204
msgid "Force connection tracking"
msgstr "Forcer le suivi des connexions"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Transfert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Transférer à"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/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:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
msgid "Hardware flow offloading"
msgstr ""
@@ -303,47 +367,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 et IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "IPv4 seulement"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "IPv6 seulement"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Entrée"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adresse IP 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zone interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limiter les messages de journalisation"
@@ -357,24 +425,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "Contrainte du MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Masquage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Type ICMP correspondant"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -382,18 +450,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -427,19 +495,19 @@ msgstr "Nouvelle redirection de port"
msgid "New source NAT"
msgstr "Nouvelle source NAT"
-#: 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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -454,26 +522,31 @@ msgstr "Ports ouverts sur le routeur"
msgid "Other..."
msgstr "Autre..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Sortie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -481,40 +554,46 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocole"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -522,24 +601,24 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Restreindre à cette famille d'adresses"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -551,15 +630,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
@@ -593,52 +672,52 @@ msgstr ""
# msgid "Protocol"
# msgstr ""
#
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Adresse IP source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Adresse MAC source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Adresse source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Port source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zone source"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -646,8 +725,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -664,7 +743,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -680,31 +759,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -716,122 +795,134 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Transmissions"
-#: 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:78
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "accepter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
#, fuzzy
msgid "any"
msgstr "tous"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "ignorer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -853,13 +944,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "rejeter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -877,9 +968,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Adresse IP de destination"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Transmission entre zones"
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index ae224bccb..cccedc020 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -8,50 +8,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -67,33 +67,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -105,15 +147,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -123,72 +165,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -198,11 +250,23 @@ msgstr ""
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr ""
@@ -211,71 +275,71 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -294,47 +358,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -348,41 +416,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -416,19 +484,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -443,63 +511,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -507,20 +586,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -532,71 +611,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -606,7 +685,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -615,31 +694,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -651,121 +730,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -787,13 +878,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index db7551f85..5a235d787 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -11,50 +11,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s %s-ban"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s %s-el"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s %s-ben"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> csomag/<var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> csom. <var>%s</var>-enként, burst <var>%d</var> csom."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> és korlátozás %s-re"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Művelet"
@@ -70,33 +70,75 @@ msgstr "Hozzáadás"
msgid "Add and edit..."
msgstr "Hozzáadás és szerkeszté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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Haladó beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Bármelyik"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Lefedett hálózatok"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Egyéni szabályok"
@@ -112,15 +154,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Cél cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Cél port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -130,72 +172,82 @@ msgstr "Cél zóna"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Érvénytelen csomagok eldobása"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Engedélyezés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "NAT visszacsatolás engedélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
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:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Külső IP cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -205,11 +257,23 @@ msgstr "Külső port"
msgid "External zone"
msgstr "Külső zóna"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "További argumentumok"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Tűzfal"
@@ -218,71 +282,71 @@ 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:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Tűzfal - Port továbbítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Tűzfal - Forgalmi szabályok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
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:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
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:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Továbbítás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Továbbítás ennek"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "%s felől %s-ben"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "%s felől %s-ben %s forrással"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "%s felől %s-ben %s és %s forrással"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/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:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
msgid "Hardware flow offloading"
msgstr ""
@@ -301,47 +365,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 és IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "csak IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "csak IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Bemenet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Belső IP cím"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Belső port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Belső zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Napló üzenetek korlátozása"
@@ -355,24 +423,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "MSS clamping engegélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Álcázás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Szűrés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
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:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -380,18 +448,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -425,21 +493,21 @@ msgstr "Új port továbbítás"
msgid "New source NAT"
msgstr "Új forrás NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -456,27 +524,32 @@ msgstr "Port megnyitása a routeren"
msgid "Other..."
msgstr "Egyéb..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Kimenet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -485,38 +558,44 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -524,20 +603,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
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:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -549,64 +628,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Forrás IP cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Forrás MAC cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Forrás cím"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Forrás port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Forrás zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -614,8 +693,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -632,7 +711,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -648,31 +727,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "%s-re %s-nél a <var>eszközön</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "%s-re %s-ben"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "%s-re a <var>eszközön</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "%s-re, %s %s-ben"
@@ -684,12 +763,12 @@ msgstr "Forrás IP-re"
msgid "To source port"
msgstr "Forrás portra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -699,109 +778,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "%s-en át"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "%s-en át %s-nél"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Továbbítások"
-#: 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:78
msgid "Zones"
msgstr "Zónák"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "elfogadás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "bármelyik"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "bármelyik gép"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "bármelyik zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "ne kövesse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "eldobás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -823,13 +914,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "visszautasítás"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -856,9 +947,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Cél IP-cím"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Zónák-közötti továbbítás"
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 731a806a5..5247eea37 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s con %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> e limita a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Azione"
@@ -72,33 +72,75 @@ msgstr "Aggiungi"
msgid "Add and edit..."
msgstr "Aggiungi e modifica..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Opzioni Avanzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Qualsiasi"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Reti coperte"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Regole Personalizzate"
@@ -114,15 +156,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Indirizzo di destinazione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Porta di destinazione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -132,72 +174,82 @@ msgstr "Zona di destinazione"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Scarta pacchetti invalidi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Attiva"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Attiva NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Attiva protezione SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Attiva registro su questa zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Indirizzo IP Esterno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -207,11 +259,23 @@ msgstr "Porta Esterna"
msgid "External zone"
msgstr "Zona Esterna"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Comandi extra"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -220,71 +284,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regole Personalizzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Inoltro Porte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regole Traffico"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Opzioni delle Zone"
-#: 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:204
msgid "Force connection tracking"
msgstr "Forza tracciamento connessione"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Inoltra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Inoltra a"
-#: 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:347
msgid "Friday"
msgstr "Venerdì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Da %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Da %s a %s con sorgente %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Da %s a %s con sorgente %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Opzioni Generali"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -303,47 +367,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Solo IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Solo IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Ingresso"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Indirizzo IP 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limita messaggi del registro"
@@ -357,24 +425,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Corrispondenza"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Corrispondenza tipo ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -382,18 +450,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Lunedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Giorni del Mese"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -427,19 +495,19 @@ msgstr "Nuova porta di inoltro"
msgid "New source NAT"
msgstr "Nuova sorgente NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -456,26 +524,31 @@ msgstr "Porte aperte sul router"
msgid "Other..."
msgstr "Altri..."
-#: 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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -483,38 +556,44 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocollo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Reindirizza il traffico in entrata allo specifico host interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -522,20 +601,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Riavvia Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Limita agli indirizzi famiglia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -547,15 +626,15 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Sabato"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
@@ -580,52 +659,52 @@ msgstr ""
# msgstr ""
# msgid "Protocol"
# msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Indirizzo IP di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Indirizzo MAC di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Indirizzo di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Porta di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona di origine"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
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:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
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:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Domenica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -633,8 +712,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -651,7 +730,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -666,31 +745,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Giovedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Orario in UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Verso %s a %s su <var>questo dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Verso %s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Verso %s su <var>questo dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Verso %s, %s in %s"
@@ -702,12 +781,12 @@ msgstr "Verso IP sorgente"
msgid "To source port"
msgstr "Verso la porta sorgente"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -717,109 +796,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Martedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Mercoledì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Giorni della Settimana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Inoltri"
-#: 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:78
msgid "Zones"
msgstr "Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "accetta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "qualsiasi"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "qualsiasi host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualsiasi zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "non tracciare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "scarta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -841,13 +932,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "rifiuta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index d665dd0be..aea3efde5 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -13,51 +13,51 @@ msgstr ""
"X-Generator: Poedit 2.2.3\n"
"Language-Team: \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:145
msgid "%s in %s"
msgstr "%s (%s)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s ,%s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s (%s)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> パケット / <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
"<var>%d</var> パケット / <var>%s</var>, バースト <var>%d</var> パケット"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var>, %s を上限に設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "転送を許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "入力を許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "出力を許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "動作"
@@ -73,33 +73,75 @@ msgstr "追加"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "詳細設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>宛先ゾーン</em>への転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr "全日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "対象ネットワーク"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "手動設定ルール"
@@ -115,15 +157,15 @@ msgstr ""
"ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
"れます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "宛先アドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "宛先ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -133,72 +175,82 @@ msgstr "宛先ゾーン"
msgid "Disable"
msgstr "無効"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "転送を破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "入力を破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "出力を破棄"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "転送を追跡しない"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "入力を追跡しない"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "出力を追跡しない"
-#: 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:42
msgid "Drop invalid packets"
msgstr "無効なパケットを遮断する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "有効"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "NATループバックを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "SYN-Floodプロテクションを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "このゾーンのログ記録を有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "外部IPアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -208,11 +260,23 @@ msgstr "外部ポート"
msgid "External zone"
msgstr "外部ゾーン"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "追加設定"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "ファイアウォール"
@@ -221,71 +285,71 @@ msgstr "ファイアウォール"
msgid "Firewall - Custom Rules"
msgstr "ファイアウォール - 手動設定ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "ファイアウォール - ポートフォワーディング"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "ファイアウォール - トラフィック・ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "強制的にコネクション追跡を行う"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "転送"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "金曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "送信元 %s (%s)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "送信元 %s (%s) , %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "送信元 %s (%s) , %s, %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "送信元 %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "送信元 %s, %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr "ハードウェア フローオフロード"
@@ -304,47 +368,51 @@ msgstr "IP の範囲"
msgid "IPs"
msgstr "IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4及びIPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "IPv4のみ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "IPv6のみ"
-#: 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:104
+#: 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
msgid "Input"
msgstr "受信"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "内部ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "内部ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "ログメッセージを制限"
@@ -358,24 +426,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: 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:132
msgid "MSS clamping"
msgstr "MSSクランプ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "マスカレード"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "対象"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "ICMPタイプの一致"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -383,18 +451,18 @@ msgstr ""
"設定された宛先ポート(またはポート範囲)に一致した受信トラフィックが対象になり"
"ます"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "月曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "月間"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -428,21 +496,21 @@ msgstr "転送設定の新規作成"
msgid "New source NAT"
msgstr "SNATルールの新規作成"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "設定されたMACアドレスと一致した受信したトラフィックが対象になります。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"設定されたIPアドレス (または範囲) と一致した受信したトラフィックが対象になり"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -459,28 +527,33 @@ msgstr "ポートの開放"
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "送信"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "出力ゾーン"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
"てください!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -489,39 +562,45 @@ msgstr ""
"ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "プロトコル"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "転送を拒否"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "入力を拒否"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "出力を拒否"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"ハードウェア NAT サポートが必要です。 mt7621 のみにおいて実装されています。"
@@ -530,20 +609,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "ファイアウォールの再起動"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "設定された宛先サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "設定された送信元サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "アドレスファミリの制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "ルーティング/NAT オフロード"
@@ -555,15 +634,15 @@ msgstr "ルールは無効です"
msgid "Rule is enabled"
msgstr "ルールは有効です"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "土曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "ソフトウェア フローオフロード"
@@ -597,52 +676,52 @@ msgstr "ソフトウェア フローオフロード"
# msgid "Protocol"
# msgstr ""
#
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "送信元IPアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "送信元MACアドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "送信元アドレス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "送信元ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "送信元ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日 (yyyy-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr "開始時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr "停止時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "日曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -650,8 +729,8 @@ msgstr ""
"ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
"ラフィックの制御を行います。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -667,7 +746,7 @@ msgstr ""
"向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
"ません。</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -681,31 +760,31 @@ msgstr ""
"準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
"のゾーンに属するかを設定します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "木曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr "時間制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "UTC時刻を使用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "宛先 %s, %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "宛先 %s (%s)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "宛先 %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "宛先 %s, %s (%s)"
@@ -717,12 +796,12 @@ msgstr "変換後送信元IP"
msgid "To source port"
msgstr "変換後送信元ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -732,109 +811,121 @@ msgstr ""
"します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
"設定することができます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "火曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "名称未設定の転送"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr "名称未設定のゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "経由 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "経由 %s , %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "水曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "全て"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "全てのホスト"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "全てのゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "コネクション追跡を行わない"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "時間"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "分"
@@ -856,13 +947,13 @@ msgstr "ポート"
msgid "ports"
msgstr "ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "拒否"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "秒"
@@ -876,3 +967,6 @@ msgstr "タイプ"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "タイプ"
+
+#~ msgid "Output zone"
+#~ msgstr "出力ゾーン"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index 757b50b50..2346b9556 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s ,%s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -72,33 +72,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Custom Rule"
@@ -113,15 +155,15 @@ msgstr ""
"수 있도록 합니다. 입력된 명령어들은 매 방화벽 재시작시 실행되는데 default "
"ruleset 이 load 된 후 시점입니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Destination 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -131,72 +173,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "NAT Loopback 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "SYN-flood protection 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "zone 의 logging 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "외부 IP 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -206,11 +258,23 @@ msgstr "외부 port"
msgid "External zone"
msgstr "외부 zone"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "추가 argument"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "방화벽"
@@ -219,71 +283,71 @@ msgstr "방화벽"
msgid "Firewall - Custom Rules"
msgstr "방화벽 - Custom Rules"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "방화벽 - Port Forwards"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "방화벽 - Traffic Rules"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "방화벽 - Zone 설정"
-#: 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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "금요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -302,47 +366,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "내부 port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "내부 zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -356,41 +424,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "월요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -424,19 +492,19 @@ msgstr "새로운 port forward"
msgid "New source NAT"
msgstr "새로운 source NAT"
-#: 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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -451,26 +519,31 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "iptables 명령에 추가 인자들을 더합니다. 조심해 사용하세요!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -478,38 +551,44 @@ msgstr ""
"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
"나 서비스에 접속할 수 있도록 합니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -517,20 +596,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "주어진 destination subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "주어진 source subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Address family 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -542,64 +621,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "토요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Source IP 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Source MAC 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Source 주소"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "시작 날짜 (yyyy-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "종료 날짜 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "일요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -607,8 +686,8 @@ msgstr ""
"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
"를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -624,7 +703,7 @@ msgstr ""
"<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
"WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -639,31 +718,31 @@ msgstr ""
"를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> "
"에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "목요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "UTC 기준시"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -675,12 +754,12 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -690,109 +769,121 @@ msgstr ""
"다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 "
"open 할때 사용됩니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "화요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "수요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "주일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Zone 내역"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -814,13 +905,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 69ed9fe8c..cab21a0ff 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -7,50 +7,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -66,33 +66,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -104,15 +146,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -122,72 +164,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -197,11 +249,23 @@ msgstr ""
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr ""
@@ -210,71 +274,71 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -293,47 +357,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -347,41 +415,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -415,19 +483,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -442,63 +510,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -506,20 +585,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -531,71 +610,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -605,7 +684,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -614,31 +693,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -650,121 +729,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -786,13 +877,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index ca2b80b76..91c01a4e9 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -8,50 +8,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s med %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> pakker per <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> pakker per <var>%s</var>, burst <var>%d</var>pakker."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> og begrens til %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Handling"
@@ -67,33 +67,75 @@ msgstr "Legg til"
msgid "Add and edit..."
msgstr "Legg til og redigere..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Enhver"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Gjeldene nettverk"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Egendefinerte Regler"
@@ -108,15 +150,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Destinasjon adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Destinasjon port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -126,72 +168,82 @@ msgstr "Destinasjon sone"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Forkast ugyldige pakker"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktiver"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Aktiver SYN-flood beskyttelse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Aktiver logging av denne sonen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Ekstern IP adressse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -201,11 +253,23 @@ msgstr "Ekstern port"
msgid "External zone"
msgstr "Ekstern sone"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Ekstra argumenter"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Brannmur"
@@ -214,72 +278,72 @@ msgstr "Brannmur"
msgid "Firewall - Custom Rules"
msgstr "Brannmur - Egendefinerte Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Brannmur - Port Videresending"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Brannmur - Trafikk Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Brannmur - Sone Innstillinger"
-#: 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:204
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:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Videresend"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Videresend til"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Fra %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Fra %s i %s med kilde %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Fra %s i %s med kilde %s og %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Generelle Innstillinger"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -298,47 +362,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 og IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Kun IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Kun IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Inndata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Intern IP adresse"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Intern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Intern sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Begrens logging"
@@ -352,24 +420,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "MSS Kontroll (Clamping)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Masquerading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Match"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Match ICMP type"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -377,18 +445,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -422,19 +490,19 @@ msgstr "Ny port videresending"
msgid "New source NAT"
msgstr "Ny kilde NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -451,26 +519,31 @@ msgstr "Åpne porter på ruteren"
msgid "Other..."
msgstr "Andre..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Utdata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -478,40 +551,46 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -519,20 +598,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Begrens til adresse familie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -544,64 +623,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Kilde IP adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Kilde MAC adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Kilde adresse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Kilde port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Kilde sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -609,8 +688,8 @@ msgstr ""
"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
"nettverkstrafikken."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -626,7 +705,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -642,31 +721,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Til %s på %s på <var>denne enheten</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Til %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Til %s på <var>denne enheten</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Til %s, %s i %s"
@@ -678,12 +757,12 @@ msgstr "Til kilde IP"
msgid "To source port"
msgstr "Til kilde port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -693,109 +772,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Via %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Via %s på %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Sone = Videresendinger"
-#: 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:78
msgid "Zones"
msgstr "Soner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "godta"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "enhver"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "enhver vert"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "enhver sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "ikke track"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "forkast"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -817,13 +908,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "avslå"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -850,9 +941,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Destinasjon IP adresse"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Sone til Sone Videresending"
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index a1107393f..94b6e924f 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -14,51 +14,51 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s z %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> pakiet. na <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
"<var>%d</var> pakiet. na <var>%s</var>, popsutych <var>%d</var> pakiet."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> i ograniczone do %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Działanie"
@@ -74,33 +74,75 @@ msgstr "Dodaj"
msgid "Add and edit..."
msgstr "Dodaj i edytuj..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Każdy"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Objęte sieci"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Własne reguły"
@@ -115,15 +157,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Adres docelowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Port docelowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -133,72 +175,82 @@ msgstr "Strefa docelowa"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Porzuć wadliwe pakiety"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Włącz"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Włącz NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
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:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Zewnętrzne adresy IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -208,11 +260,23 @@ msgstr "Port zewnętrzny"
msgid "External zone"
msgstr "Strefa zewnętrzna"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Dodatkowe argumenty"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -224,71 +288,71 @@ msgstr "Zapora"
msgid "Firewall - Custom Rules"
msgstr "Zapora - Reguły własne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Zapora - Przekazywanie portów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Zapora - Reguły ruchu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Zapora - Ustawienia strefy"
-#: 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:204
msgid "Force connection tracking"
msgstr "Wymuś śledzenie połączeń"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Przekazuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Przekazuj do"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Z %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Z %s w %s ze źródłem %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Z %s w %s ze źródłem %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Ustawienia ogólne"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -307,47 +371,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Tylko IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Tylko IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Ruch przychodzący"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Wewnętrzny adres 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Wewnętrzny port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Strefa wewnętrzna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Ograniczenie logowania"
@@ -361,24 +429,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "Dostosuj MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Maskarada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Dopasuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Dopasuj typ ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -386,18 +454,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -431,19 +499,19 @@ msgstr "Nowe przekierowanie portu"
msgid "New source NAT"
msgstr "Nowy NAT źródłowy"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -460,27 +528,32 @@ msgstr "Otwarte porty na routerze"
msgid "Other..."
msgstr "Inne..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Wyjście (Output)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -488,40 +561,46 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokół"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -529,22 +608,22 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Ogranicz do rodziny adresów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -556,64 +635,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Źródłowy adres IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Źródłowy adres MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Adres źródłowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Port źródłowy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Strefa źródłowa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -621,8 +700,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -638,7 +717,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -653,31 +732,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Do %s w %s na <var>tym urządzeniu</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Do %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Do %s na <var>tym urządzeniu</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Do %s, %s w %s"
@@ -689,12 +768,12 @@ msgstr "Do źródłowego IP"
msgid "To source port"
msgstr "Do źródłowego portu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -704,109 +783,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Przez %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Przez %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Strefa ⇒ Przekazywanie"
-#: 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:78
msgid "Zones"
msgstr "Strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "akceptuj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "dowolny"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "dowolny host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "dowolna strefa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "nie śledź"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "porzucaj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -828,13 +919,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "odrzucaj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -861,9 +952,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Docelowy adres IP"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Przekazywanie pomiędzy strefami"
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 8778a6bbc..4f415d7ab 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -13,50 +13,50 @@ msgstr ""
"X-Generator: Poedit 2.1.1\n"
"Language-Team: \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:145
msgid "%s in %s"
msgstr "%s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s com %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> pcts. por <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> pcts. por <var>%s</var>, pico <var>%d</var> pcts."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> e limite a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "Aceitar o encaminhamento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "Aceitar a entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "Aceitar a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Ação"
@@ -72,33 +72,75 @@ msgstr "Adicionar"
msgid "Add and edit..."
msgstr "Adicionar e editar..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Configurações Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Qualquer"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Redes cobertas"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Regras Personalizadas"
@@ -113,15 +155,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Endereço de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Porta de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -131,73 +173,83 @@ msgstr "Zona de destino"
msgid "Disable"
msgstr "Desabilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "Descartar o encaminhamento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "Descartar a entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "Descartar a saída"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "Não rastrear o encaminhamento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "Não rastrear a entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "Não rastrear a saída"
-#: 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:42
msgid "Drop invalid packets"
msgstr "Descartar pacotes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Habilitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Habilite o Loopback do NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Habilite proteção contra SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Habilite o registro nesta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
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/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Endereço IP externo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -207,11 +259,23 @@ msgstr "Porta Externa"
msgid "External zone"
msgstr "Zona externa"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Argumentos extras"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -220,71 +284,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Encaminhamento de Portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regras de Tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configurações de Zona"
-#: 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:204
msgid "Force connection tracking"
msgstr "Force o rastreamento da conexão"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Encaminhar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Encaminhar para"
-#: 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:347
msgid "Friday"
msgstr "Sexta-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Vindo de %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Vindo de %s em %s com origem %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Vindo de %s em %s com origem %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "De %s <var>neste dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "De %s <var>neste dispositivo</var> com origem %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Configurações Gerais"
-#: 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:71
msgid "Hardware flow offloading"
msgstr "Aceleração de fluxo de dados via Hardware"
@@ -303,47 +367,51 @@ msgstr "Faixa IP"
msgid "IPs"
msgstr "IPs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Somente IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Somente IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Endereço IP 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limita as mensagens de registro"
@@ -357,24 +425,24 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: 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:132
msgid "MSS clamping"
msgstr "Ajuste do MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Mascaramento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Casa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Casa com ICMP tipo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -382,18 +450,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Segunda-Feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Dias do mês"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -427,20 +495,20 @@ msgstr "Novo encaminhamento de porta"
msgid "New source NAT"
msgstr "Nova origem NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -457,26 +525,31 @@ msgstr "Abrir portas no roteador"
msgid "Other..."
msgstr "Outro..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "Zona de saída"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -484,39 +557,45 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redireciona tráfego entrante para o computador interno especificado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "Recusar encaminhamento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "Recusar entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "Recusar saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
@@ -524,20 +603,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:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
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:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
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:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
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:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Aceleração de Roteamento/NAT"
@@ -549,64 +628,64 @@ 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:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Sábado"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
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:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
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:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Endereço IP de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Endereço MAC de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Endereço de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "Dia inicial (aaaa-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Dia final (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Domingo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -614,8 +693,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -631,7 +710,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -646,31 +725,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Quita-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Hora em UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Para %s em %s <var>neste dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Para %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Para %s <var>neste dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
@@ -682,12 +761,12 @@ msgstr "Para o endereço IP de origem"
msgid "To source port"
msgstr "Para a porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -697,109 +776,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Terça-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "Encaminhamento sem nome"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
msgstr "Regra sem nome"
-#: 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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Via %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Via %s at %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Quarta-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Dias da semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
-#: 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:78
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "aceitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "qualquer"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "qualquer equipamento"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualquer zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "não rastrear"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "descartar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "hora"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "minuto"
@@ -821,13 +912,13 @@ msgstr "porta"
msgid "ports"
msgstr "portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "rejeitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "segundo"
@@ -842,6 +933,9 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#~ msgid "Output zone"
+#~ msgstr "Zona de saída"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada Sem Nome)"
@@ -854,9 +948,6 @@ msgstr "tipos"
#~ msgid "Destination IP address"
#~ msgstr "Endereço IP de destino"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Encaminhamento entre Zonas"
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 52205f66f..8dde627c0 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s with %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> pkts. por <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Acção"
@@ -72,33 +72,75 @@ msgstr "Adicionar"
msgid "Add and edit..."
msgstr "Adicionar e editar..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Definições Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Qualquer"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Redes abrangidas"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Regras Personalizadas"
@@ -114,15 +156,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Endereço de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Porta de destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -132,72 +174,82 @@ msgstr "Zona de destino"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Cancelar pacotes inválidos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Ativar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Ativar NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Ativar a Proteção SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Ativar registo nesta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Endereço IP externo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -207,11 +259,23 @@ msgstr "Porta externa"
msgid "External zone"
msgstr "Zona externa"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Argumentos extra"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -220,71 +284,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras Personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Firewall - Encaminhamento de Portas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Firewall - Regras de Tráfego"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Firewall - Definições de Zona"
-#: 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:204
msgid "Force connection tracking"
msgstr "Forçar rasto de ligação"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Encaminhar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Encaminhar para"
-#: 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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "De %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "De %s em %s com origem %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "De %s em %s com origem %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Definições Gerais"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -303,47 +367,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Só IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Só IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Entrada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Endereço IP 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limitar registo de mensagens"
@@ -357,25 +425,25 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
#, fuzzy
msgid "MSS clamping"
msgstr "MSS-Correction"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Corresponder"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -383,18 +451,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -428,19 +496,19 @@ msgstr "Novo encaminhamento de porta"
msgid "New source NAT"
msgstr "Nova origem de NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
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:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -457,26 +525,31 @@ msgstr "Abrir portas no router"
msgid "Other..."
msgstr "Outro..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
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/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -484,40 +557,46 @@ 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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocolo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -525,20 +604,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
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:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -550,64 +629,64 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Endereço IP de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Endereço MAC de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Endereço de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -615,8 +694,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -626,7 +705,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -635,31 +714,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Para %s no %s em <var>este dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Para %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Para %s em <var>este dispositivo</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
@@ -671,12 +750,12 @@ msgstr "Para o IP de origem"
msgid "To source port"
msgstr "Para a porta de origem"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -686,109 +765,121 @@ 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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Via %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Via %s no %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
-#: 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:78
msgid "Zones"
msgstr "Zonas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "aceitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "qualquer"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "qualquer host"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "qualquer zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "não seguir"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "drop"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -810,13 +901,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "rejeitar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -843,9 +934,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Endereço IP de destino"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Encaminhamento Inter-Zona"
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index b25628c7c..92c8b8a9a 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -12,50 +12,50 @@ msgstr ""
"20)) ? 1 : 2);;\n"
"X-Generator: Pootle 2.0.6\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:145
msgid "%s in %s"
msgstr "%s în %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s cu %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s în %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Acţiune"
@@ -71,33 +71,75 @@ msgstr "Adaugă"
msgid "Add and edit..."
msgstr "Adaugă şi editează..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Setări avansate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Oricare"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Retele acoperite"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Reguli suplimentare"
@@ -109,15 +151,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Destinaţie adresă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Portul destinatie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -127,72 +169,82 @@ msgstr "Zona destinatie"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Descarcă pachetele invalide"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Activează"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Activează loopback NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Activează protecţia SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Activeaza log in aceasta zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Adresă IP externă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -202,11 +254,23 @@ msgstr "Port extern"
msgid "External zone"
msgstr "Zonă externă"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -215,71 +279,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reguli particularizate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Setari zona la firewall"
-#: 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:204
msgid "Force connection tracking"
msgstr "Forteaza urmarirea conexiunilor"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Forward"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Setari generale"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -298,47 +362,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 şi IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "doar IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "doar IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Intrare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adresa IP interna"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port intern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zonă internă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Limitează mesaje în log"
@@ -352,41 +420,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr "Ajustare MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Translatare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Potrivire"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Potriveste pe tipul de ICMP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -420,19 +488,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -447,63 +515,74 @@ msgstr ""
msgid "Other..."
msgstr "Altele..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Ieşire"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protocol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -511,20 +590,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -536,71 +615,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "Sursă adresă IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "Sursă adresă MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Adresa sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Port sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Zona sursa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -610,7 +689,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -619,31 +698,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -655,121 +734,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "accept"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "oricare"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -791,13 +882,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -824,9 +915,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Destinaţie adresă IP"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "Forwardare intre-zone"
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index 63f207304..9fd25a015 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -15,50 +15,50 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\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:145
msgid "%s in %s"
msgstr "%s в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s с %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> пакетов за <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> пакетов за <var>%s</var>, подряд <var>%d</var> пакетов"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> с пределом в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "Принимать перенаправляемый трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "Принимать входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "Принимать исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Действие"
@@ -74,33 +74,75 @@ msgstr "Добавить"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Дополнительные настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr "Любой день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Использовать сети"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Пользовательские правила"
@@ -116,15 +158,15 @@ msgstr ""
"каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил "
"по умолчанию."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Адрес назначения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Порт назначения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -134,72 +176,82 @@ msgstr "Зона назначения"
msgid "Disable"
msgstr "Отключить"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "Отклонять перенаправляемый трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "Отклонять входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "Отклонять исходящий трафик"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "Не отслеживать перенаправляемый трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "Не отслеживать входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "Не отслеживать исходящий трафик"
-#: 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:42
msgid "Drop invalid packets"
msgstr "Отбрасывать некорректные пакеты"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Включить"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Включить NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Включить защиту от SYN-flood атак"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Включить журналирование в этой зоне"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Внешний IP-адрес"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -209,11 +261,23 @@ msgstr "Внешний порт"
msgid "External zone"
msgstr "Внешняя зона"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Дополнительные аргументы"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Межсетевой экран"
@@ -222,71 +286,71 @@ msgstr "Межсетевой экран"
msgid "Firewall - Custom Rules"
msgstr "Межсетевой экран - Пользовательские правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Межсетевой экран - Перенаправление портов"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Межсетевой экран - Правила для трафика"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "Включить отслеживание соединений"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Перенаправление"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "Пятница"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Из %s в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Из %s в %s с источником %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Из %s в %s с источниками %s и %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "Из %s в <var>это устройство</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "Из %s в <var>это устройство</var> с источником %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr "Аппаратный flow offloading"
@@ -305,47 +369,51 @@ msgstr "Диапазон IP-адресов"
msgid "IPs"
msgstr "IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 и IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Только IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Только IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Внутренний порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Внутренняя зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Ограничить журнал сообщений"
@@ -359,24 +427,24 @@ msgstr "MAC-адрес"
msgid "MACs"
msgstr "MAC-адреса"
-#: 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:132
msgid "MSS clamping"
msgstr "Ограничение MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Маскарадинг"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Соответствовать ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -384,18 +452,18 @@ msgstr ""
"Порт или диапазон портов, входящие подключения на который будут "
"перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Понедельник"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Дни месяца"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -429,22 +497,22 @@ msgstr "Новое перенаправление порта"
msgid "New source NAT"
msgstr "Новый SNAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "Применять правило только для входящего трафика от этих MAC-адресов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
"Применять правило только для входящего трафика от этого IP-адреса или "
"диапазона адресов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -461,28 +529,33 @@ msgstr "Открыть порты на маршрутизаторе"
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "Исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "Исходящая зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передаёт дополнительные аргументы таблице iptables. Используйте с "
"осторожностью!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -490,40 +563,46 @@ msgstr ""
"Перенаправленные портов позволяет удалённым компьютерам из Интернета "
"соединяться с компьютером или службой внутри частной локальной сети."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Перенаправлять трафик на указанный IP-адрес"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "Сбрасывать перенаправляемый трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "Сбрасывать входящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "Сбрасывать исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
"Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621"
@@ -532,20 +611,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Перезапустить межсетевой экран"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Использовать протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Маршрутизация/NAT offloading"
@@ -557,71 +636,71 @@ msgstr "Правило отключено"
msgid "Rule is enabled"
msgstr "Правило включено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Суббота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr "Программная реализация offloading для маршрутизации/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "Программный flow offloading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "IP-адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "MAC-адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Адрес источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Порт источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Зона источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr "Время начала (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата окончания (год-мес-день)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr "Время окончания (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Воскресенье"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -638,7 +717,7 @@ msgstr ""
"перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
"из wan в lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -653,31 +732,31 @@ msgstr ""
"различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие "
"доступные сети являются членами этой зоны."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Четверг"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr "Временные ограничения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Время UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "К %s, %s на <var>этом устройстве</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "К %s в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "К %s на <var>этом устройстве</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "К %s, %s в %s"
@@ -689,12 +768,12 @@ msgstr "К IP-адресу источника"
msgid "To source port"
msgstr "К порту источника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -704,109 +783,121 @@ msgstr ""
"зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
"портов маршрутизатора."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Вторник"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "Перенаправление без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr "Зона без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Через %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Через %s, %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Среда"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Дни недели"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Зоны"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "принимать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "любой"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "любого хоста"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "любой зоны"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "не отслеживать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "не обрабатывать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "час"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "минута"
@@ -828,13 +919,13 @@ msgstr "порт"
msgid "ports"
msgstr "порты"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "отвергать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "секунда"
@@ -848,3 +939,6 @@ msgstr "тип"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
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 613dbda10..9cc480774 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -8,50 +8,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -67,33 +67,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -105,15 +147,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -123,72 +165,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -198,11 +250,23 @@ msgstr ""
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr ""
@@ -211,71 +275,71 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -294,47 +358,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -348,41 +416,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -416,19 +484,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -443,63 +511,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -507,20 +586,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -532,71 +611,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -606,7 +685,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -615,31 +694,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -651,121 +730,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -787,13 +878,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index 3d1dfdde0..b36b4cda1 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -9,50 +9,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s med %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%2, %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> pkt. per <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> pkt. per <var>%s</var>, brustna <var>%d</var> pkt."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> och gränsen till %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Åtgärd"
@@ -68,33 +68,75 @@ msgstr "Lägg till"
msgid "Add and edit..."
msgstr "Lägg till och redigera..."
-#: 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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Avancerade inställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
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:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
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:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
msgstr "Alla"
-#: 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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Nätverk som omfattas"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Anpassade regler"
@@ -106,15 +148,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Destinationens adress"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Destinationsport"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -124,72 +166,82 @@ msgstr "Destinationens zon"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr "Släpp ogiltiga paket"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Aktivera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
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:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Extern IP-adress"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -199,11 +251,23 @@ msgstr "Extern port"
msgid "External zone"
msgstr "Extern zon"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Extra argument"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Brandvägg"
@@ -212,71 +276,71 @@ msgstr "Brandvägg"
msgid "Firewall - Custom Rules"
msgstr "Brandvägg - Anpassade regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Brandvägg - Vidarebefordring av port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Brandvägg - Trafikregler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
msgstr "Brandvägg - Zoninställningar"
-#: 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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Vidarebefordra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
msgstr "Vidarebefordra till"
-#: 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:347
msgid "Friday"
msgstr "Fredag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "Från %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "Från %s i %s med källa %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "Från %s i %s med källa %s och %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Generella inställningar"
-#: 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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -295,47 +359,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 och IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Endast IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Endast IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Inmatning"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Intern IP-adress"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Intern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Intern zon"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Begränsa loggmeddelanden"
@@ -349,24 +417,24 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Maskering"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Matcha"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Matchar ICMP-typ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -374,18 +442,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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Måndag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Dagar i månaden"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -419,20 +487,20 @@ msgstr "Ny vidarebefordring av port"
msgid "New source NAT"
msgstr "Ny käll-NAT"
-#: 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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -447,63 +515,74 @@ msgstr "Öppna portar i router"
msgid "Other..."
msgstr "Andra..."
-#: 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:105
+#: 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
msgid "Output"
msgstr "Utmatning"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Protokoll"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -511,20 +590,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Starta om brandvägg"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Begränsa till adressfamilj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -536,71 +615,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Lördag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "IP-adress för källa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "MAC-adress för källa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (åååå-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Stopptid (åååå-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Söndag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -610,7 +689,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -619,31 +698,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Torsdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Tid enligt UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "Till %s vid %s på <var>den här enheten</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "Till %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "Till %s på <var>den här enheten</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "Till %s, %s i %s"
@@ -655,121 +734,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Tisdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Via %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Onsdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Veckodagar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Zoner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "acceptera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "alla"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "alla värdar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "alla zoner"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "spåra inte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "släpp"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -791,13 +882,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "neka"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
@@ -824,9 +915,6 @@ msgstr ""
#~ msgid "Destination IP address"
#~ msgstr "Destinationens IP-adress"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Match forwarded traffic to the given destination port or port range."
#~ msgstr ""
#~ "Matcha vidarebefordrad trafik till den angivna destinationsporten eller "
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 27b201547..d645720a7 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -1,50 +1,50 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: 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:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -60,33 +60,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -98,15 +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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -116,72 +158,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -191,11 +243,23 @@ msgstr ""
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr ""
@@ -204,71 +268,71 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -287,47 +351,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -341,41 +409,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -409,19 +477,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -436,63 +504,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -500,20 +579,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -525,71 +604,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -599,7 +678,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -608,31 +687,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -644,121 +723,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -780,13 +871,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 4c740491f..5dc20d7ac 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -8,50 +8,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr ""
@@ -67,33 +67,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -105,15 +147,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -123,72 +165,82 @@ msgstr ""
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
msgid "Drop invalid packets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -198,11 +250,23 @@ msgstr ""
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr ""
@@ -211,71 +275,71 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -294,47 +358,51 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -348,41 +416,41 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -416,19 +484,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -443,63 +511,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -507,20 +586,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -532,71 +611,71 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -606,7 +685,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -615,31 +694,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -651,121 +730,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -787,13 +878,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index c256a03b9..a3e925ffe 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -9,50 +9,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s у %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s із %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s у %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> пакетів за <var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> пакетів за <var>%s</var>, підряд <var>%d</var> пакетів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> з лімітом %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "Приймати переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "Приймати вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "Приймати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Дія"
@@ -68,33 +68,75 @@ msgstr "Додати"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "Розширені настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr "Будь-який день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "Покриті мережі"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "Настроювані правила"
@@ -110,15 +152,15 @@ msgstr ""
"виконуються після кожного перезавантаження брандмауера, відразу після "
"завантаження типового набору правил."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Адреса призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Порт призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -128,72 +170,82 @@ msgstr "Зона призначення"
msgid "Disable"
msgstr "Вимкнути"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "Відкидати переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "Відкидати вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "Відкидати вихідний"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "Не відслідковувати переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "Не відслідковувати вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "Не відслідковувати вихідний"
-#: 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:42
msgid "Drop invalid packets"
msgstr "Відкидати помилкові пакети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Увімкнути"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "Увімкнути NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "Увімкнути захист від SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "Увімкнути реєстрування у цій зоні"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "Зовнішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -203,11 +255,23 @@ msgstr "Зовнішній порт"
msgid "External zone"
msgstr "Зовнішня зона"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "Додаткові аргументи"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Брандмауер"
@@ -216,71 +280,71 @@ msgstr "Брандмауер"
msgid "Firewall - Custom Rules"
msgstr "Брандмауер — Настроювані правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "Брандмауер — Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "Брандмауер — Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "Увімкнути відстеження з'єднань"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "П'ятниця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "%s у %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "%s у %s з джерелом %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "%s у %s з джерелом %s та %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "Від %s на <var>цьому пристрої</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr "Апаратні засоби розвантаження потоку"
@@ -299,47 +363,51 @@ msgstr "Діапазон IP"
msgid "IPs"
msgstr "IP-адреси"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 та IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "Лише IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "Лише IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "Вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Внутрішній порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Внутрішня зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "Обмеження повідомлень журналу"
@@ -353,24 +421,24 @@ msgstr "MAC-адреса"
msgid "MACs"
msgstr "MAC-адреси"
-#: 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:132
msgid "MSS clamping"
msgstr "Затискання MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "Підміна"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "Зіставляти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "Зіставляти ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -378,18 +446,18 @@ msgstr ""
"Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
"діапазон портів цього вузла."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "Понеділок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "Дні місяця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -423,19 +491,19 @@ msgstr "Нове переспрямовування порту"
msgid "New source NAT"
msgstr "Новий NAT джерела"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -452,27 +520,32 @@ msgstr "Відкрити порти на роутері"
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "Вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "Вихідна зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -480,39 +553,45 @@ msgstr ""
"Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
"підключатися до певного комп'ютера або служби у приватній мережі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "Відхиляти переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "Відхиляти вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "Відхиляти вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
@@ -520,20 +599,20 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
msgid "Restart Firewall"
msgstr "Перезавантажити брандмауер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "Обмежити підміну заданими підмережами призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "Обмежити підміну заданими підмережами джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "Обмежити сімейство протоколів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Розвантаження маршрутизації/NAT"
@@ -545,64 +624,64 @@ msgstr "Правило вимкнено"
msgid "Rule is enabled"
msgstr "Правило ввімкнено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "Субота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr "Програмне розвантаження для маршрутизації/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "Програмне розвантаження потоку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "IP-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "MAC-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "Адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Порт джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "Зона джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr "Час початку (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата зупинки (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr "Час зупинки (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "Неділя"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -610,8 +689,8 @@ msgstr ""
"Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
"потоком мережевого трафіку."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -628,7 +707,7 @@ msgstr ""
"від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
"до LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -642,31 +721,31 @@ msgstr ""
"трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
"визначає, які доступні мережі є членами цієї зони."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "Четвер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr "Часові обмеження"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "Час в UTC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "%s на %s <var>цього пристрою</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "%s у %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "%s на <var>цього пристрою</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "%s, %s у %s"
@@ -678,12 +757,12 @@ msgstr "До IP джерела"
msgid "To source port"
msgstr "До порту джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -693,109 +772,121 @@ msgstr ""
"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
"порти WAN на маршрутизаторі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "Вівторок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "Переспрямовування без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr "Зона без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "Через %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "Через %s на %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "Середа"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "Дні тижня"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "приймати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "будь-який"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "будь-який вузол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "будь-якій зоні"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "не відстеж."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "опускати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "година"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "хвилина"
@@ -817,13 +908,13 @@ msgstr "порт"
msgid "ports"
msgstr "порти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "відкидати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "секунду"
@@ -837,3 +928,6 @@ msgstr "типом"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "типами"
+
+#~ msgid "Output zone"
+#~ msgstr "Вихідна зона"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index a445b0e90..7e0d12639 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -13,50 +13,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "Action"
@@ -72,33 +72,75 @@ msgstr ""
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr ""
@@ -110,15 +152,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:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "Địa chỉ điểm đến"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "Cổng điểm đến"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
#, fuzzy
@@ -129,73 +171,83 @@ msgstr "Điểm đến"
msgid "Disable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr ""
-#: 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:42
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:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
#, fuzzy
msgid "Enable SYN-flood protection"
msgstr "SYN-flood bảo vệ "
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -205,11 +257,23 @@ msgstr "External port"
msgid "External zone"
msgstr ""
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "Firewall"
@@ -218,71 +282,71 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr ""
@@ -301,49 +365,53 @@ msgstr ""
msgid "IPs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
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:104
+#: 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
msgid "Input"
msgstr "Input"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
#, fuzzy
msgid "Internal IP address"
msgstr "Internal address"
-#: 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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
#, fuzzy
msgid "Internal port"
msgstr "External port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr ""
@@ -357,42 +425,42 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: 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:132
#, fuzzy
msgid "MSS clamping"
msgstr "MSS Clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -426,19 +494,19 @@ msgstr ""
msgid "New source NAT"
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:210
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -453,63 +521,74 @@ msgstr ""
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
+#: 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
+msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
-msgid "Passes additional arguments to iptables. Use with care!"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
@@ -517,20 +596,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr ""
@@ -542,67 +621,67 @@ msgstr ""
msgid "Rule is enabled"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
#, fuzzy
msgid "Source IP address"
msgstr "Đỉa chỉ MAC nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
#, fuzzy
msgid "Source address"
msgstr "Đỉa chỉ MAC nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "Cổng nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
#, fuzzy
msgid "Source zone"
msgstr "Cổng nguồn"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -610,8 +689,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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -621,7 +700,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:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -630,31 +709,31 @@ 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:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr ""
@@ -666,121 +745,133 @@ msgstr ""
msgid "To source port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "Zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "chấp nhận"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr ""
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "drop"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr ""
@@ -802,13 +893,13 @@ msgstr ""
msgid "ports"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "Không chấp nhận"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr ""
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 4c7ee906f..13e4f0aee 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -11,50 +11,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s 位于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s 和 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s 位于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> 数据包/<var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> 数据包/<var>%s</var>,突发 <var>%d</var> 数据包。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> 并限制到 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "接受转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "接受入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "接受出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "动作"
@@ -70,33 +70,75 @@ msgstr "添加"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "高级设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr "允许从<em>源区域</em>转发:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允许转发到<em>目标区域</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "覆盖网络"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "自定义规则"
@@ -110,15 +152,15 @@ msgstr ""
"自定义规则允许您执行不属于防火墙框架的任意 iptables 命令。每次重启防火墙时,"
"在默认的规则运行后这些命令将立即执行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "目标地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "目标端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -128,72 +170,82 @@ msgstr "目标区域"
msgid "Disable"
msgstr "禁用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "丢弃转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "丢弃入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "丢弃出站"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "不跟踪转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "不跟踪入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "不跟踪出站"
-#: 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:42
msgid "Drop invalid packets"
msgstr "丢弃无效数据包"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "启用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "启用 NAT 环回"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "启用 SYN-flood 防御"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "启用此区域的日志记录"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "实验特性。与 QoS/SQM 不完全兼容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "外部 IP 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -203,11 +255,23 @@ msgstr "外部端口"
msgid "External zone"
msgstr "外部区域"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "附加参数"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "防火墙"
@@ -216,71 +280,71 @@ msgstr "防火墙"
msgid "Firewall - Custom Rules"
msgstr "防火墙 - 自定义规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "防火墙 - 端口转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "防火墙 - 通信规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "强制连接追踪"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "星期五"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "来自 %s 位于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "来自 %s 位于 %s 源于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "来自 %s 位于 %s 源端口 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "来自 %s 位于<var>本设备</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "来自 %s 位于<var>本设备</var>源于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr "硬件流量分载"
@@ -299,47 +363,51 @@ msgstr "IP 范围"
msgid "IPs"
msgstr "IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "仅 IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "仅 IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "入站数据"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "内部端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "内部区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "限制日志信息"
@@ -353,41 +421,41 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: 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:132
msgid "MSS clamping"
msgstr "MSS 钳制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "IP 动态伪装"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "匹配规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "匹配 ICMP 类型"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -421,19 +489,19 @@ msgstr "新建端口转发"
msgid "New source NAT"
msgstr "新建 Source NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "仅匹配来自这些 MAC 的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -448,64 +516,75 @@ msgstr "打开路由器端口"
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "出站数据"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "出站区域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables 的额外参数。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "协议"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "重定向匹配的入站流量到指定的内部主机"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "拒绝转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "拒绝入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "拒绝出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
@@ -513,20 +592,20 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
msgid "Restart Firewall"
msgstr "重启防火墙"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 动态伪装的目标子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 动态伪装的源子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "限制地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分载"
@@ -538,71 +617,71 @@ msgstr "规则已禁用"
msgid "Rule is enabled"
msgstr "规则已启用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "星期六"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr "基于软件的 Routing/NAT 分载"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "软件流量分载"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "源 IP 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "源 MAC 地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "源地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "源端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "源区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "开始日期(yyyy-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "星期日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -616,7 +695,7 @@ msgstr ""
"strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的,例如:一条允许"
"从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -628,31 +707,31 @@ msgstr ""
"域入站和出站流量的默认策略,<em>转发</em>选项描述该区域内不同网络之间的流量转"
"发策略。<em>覆盖网络</em>指定从属于这个区域的网络。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "星期四"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "UTC 时间"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "到 %s 在 %s 位于<var>本设备</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "到 %s 位于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "到 %s 位于<var>本设备</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位于 %s"
@@ -664,12 +743,12 @@ msgstr "到源 IP"
msgid "To source port"
msgstr "到源端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -678,109 +757,121 @@ msgstr ""
"通信规则定义了不同区域间的数据包传输策略,例如:拒绝一些主机之间的通信,开放"
"路由器 WAN 上的端口。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "星期二"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "未命名转发"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "通过 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "通过 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "接受"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "所有"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "所有主机"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "所有区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "不跟踪"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "丢弃"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "小时"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "分钟"
@@ -802,13 +893,13 @@ msgstr "端口"
msgid "ports"
msgstr "端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "拒绝"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "秒"
@@ -823,6 +914,9 @@ msgstr "类型"
msgid "types"
msgstr "类型"
+#~ msgid "Output zone"
+#~ msgstr "出站区域"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(未命名条目)"
@@ -835,9 +929,6 @@ msgstr "类型"
#~ msgid "Destination IP address"
#~ msgstr "目标 IP 地址"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "端口触发"
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index cde66073c..1e236c78a 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -11,50 +11,50 @@ 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:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
msgid "%s in %s"
msgstr "%s 位於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
msgid "%s%s with %s"
msgstr "%s%s 和 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
msgid "%s, %s in %s"
msgstr "%s, %s 位於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
msgid "<var>%d</var> pkts. per <var>%s</var>"
msgstr "<var>%d</var> 資料包/<var>%s</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:262
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
msgstr "<var>%d</var> 資料包/<var>%s</var>,突發 <var>%d</var> 資料包。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:106
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> 並限制到 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
msgid "Accept forward"
msgstr "接受轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:294
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
msgid "Accept input"
msgstr "接受入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
msgid "Accept output"
msgstr "接受出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:160
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:315
+#: 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
msgid "Action"
msgstr "動作"
@@ -70,33 +70,75 @@ msgstr "新增"
msgid "Add and edit..."
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:73
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+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
+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
msgid "Advanced Settings"
msgstr "高階設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+msgid "Allow \"invalid\" traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
msgid "Allow forward from <em>source zones</em>:"
msgstr "允許從<em>源區域</em>轉發:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允許轉發到<em>目標區域</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
msgid "Any"
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:344
+#: 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
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+msgid "Automatic helper assignment"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+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
+msgid "Conntrack Settings"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Conntrack helpers"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+msgid "Covered devices"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
msgid "Covered networks"
msgstr "覆蓋網路"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+msgid "Covered subnets"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
msgid "Custom Rules"
msgstr "自訂規則"
@@ -110,15 +152,15 @@ msgstr ""
"自訂規則允許您執行不屬於防火牆框架的任意 iptables 指令。每次重啟防火牆時,在"
"預設的規則執行後這些指令將立即執行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:295
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
msgid "Destination address"
msgstr "目標位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
msgid "Destination port"
msgstr "目標埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:286
+#: 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
msgid "Destination zone"
@@ -128,72 +170,82 @@ msgstr "目標區域"
msgid "Disable"
msgstr "禁用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
msgid "Discard forward"
msgstr "丟棄轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:300
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
msgid "Discard input"
msgstr "丟棄入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
msgid "Discard output"
msgstr "丟棄出站"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+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:288
+#: 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"
msgstr "不跟蹤轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
msgid "Do not track input"
msgstr "不跟蹤入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:278
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
msgid "Do not track output"
msgstr "不跟蹤出站"
-#: 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:42
msgid "Drop invalid packets"
msgstr "丟棄無效資料包"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:166
+#: 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/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "啟用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
msgid "Enable NAT Loopback"
msgstr "啟用 NAT 環回"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
msgid "Enable SYN-flood protection"
msgstr "啟用 SYN-flood 防禦"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
msgid "Enable logging on this zone"
msgstr "啟用此區域的日誌記錄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:49
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "實驗特性。與 QoS/SQM 不完全相容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
msgid "External IP address"
msgstr "外部 IP 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: 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
msgid "External port"
@@ -203,11 +255,23 @@ msgstr "外部埠"
msgid "External zone"
msgstr "外部區域"
-#: 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:323
+#: 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
msgid "Extra arguments"
msgstr "附加引數"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+msgid "Extra destination arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+msgid "Extra iptables arguments"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+msgid "Extra source arguments"
+msgstr ""
+
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
msgid "Firewall"
msgstr "防火牆"
@@ -216,71 +280,71 @@ msgstr "防火牆"
msgid "Firewall - Custom Rules"
msgstr "防火牆 - 自訂規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
msgid "Firewall - Port Forwards"
msgstr "防火牆 - 埠轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:126
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
msgid "Firewall - Traffic Rules"
msgstr "防火牆 - 通訊規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:23
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
msgid "Firewall - Zone Settings"
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:204
msgid "Force connection tracking"
msgstr "強制連線追蹤"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:106
+#: 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
msgid "Forward"
msgstr "轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
msgid "Forward to"
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:347
msgid "Friday"
msgstr "星期五"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:63
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
msgid "From %s in %s"
msgstr "來自 %s 位於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:59
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
msgid "From %s in %s with source %s"
msgstr "來自 %s 位於 %s 源於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
msgid "From %s in %s with source %s and %s"
msgstr "來自 %s 位於 %s 源埠 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:74
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
msgid "From %s on <var>this device</var>"
msgstr "來自 %s 位於<var>本裝置</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
msgid "From %s on <var>this device</var> with source %s"
msgstr "來自 %s 位於<var>本裝置</var>源於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:70
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
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:98
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:134
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:26
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: 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/luasrc/controller/firewall.lua:9
msgid "General Settings"
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:71
msgid "Hardware flow offloading"
msgstr "硬體流量分載"
@@ -299,47 +363,51 @@ msgstr "IP 範圍"
msgid "IPs"
msgstr "IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
msgid "IPv4"
msgstr "IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:160
+#: 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
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: 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
msgid "IPv4 only"
msgstr "僅 IPv4"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:180
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+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
msgid "IPv6 only"
msgstr "僅 IPv6"
-#: 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:104
+#: 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
msgid "Input"
msgstr "入站資料"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
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:250
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "內部埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "內部區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
msgid "Limit log messages"
msgstr "限制日誌資訊"
@@ -353,41 +421,41 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: 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:132
msgid "MSS clamping"
msgstr "MSS 鉗制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
msgid "Masquerading"
msgstr "IP 動態偽裝"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:113
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:150
+#: 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
msgid "Match"
msgstr "匹配規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
msgid "Match ICMP type"
msgstr "匹配 ICMP 型別"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
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:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:146
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: 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
@@ -421,19 +489,19 @@ msgstr "新建埠轉發"
msgid "New source NAT"
msgstr "新建 Source NAT"
-#: 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:210
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:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
msgid "Only match incoming traffic from these MACs."
msgstr "僅匹配來自這些 MAC 的入站流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
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:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -448,63 +516,74 @@ msgstr "開啟路由器埠"
msgid "Other..."
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:105
+#: 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
msgid "Output"
msgstr "出站資料"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-msgid "Output zone"
-msgstr "出站區域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:256
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:324
+#: 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
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳遞到 iptables 的額外引數。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+msgid ""
+"Passing raw iptables arguments to source and destination traffic "
+"classification rules allows to match packets based on other criteria than "
+"interfaces or subnets. These options should be used with extreme care as "
+"invalid values could render the firewall ruleset broken, completely exposing "
+"all services."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
#: 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:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
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/forwards.js:142
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+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
msgid "Protocol"
msgstr "協議"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
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:228
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "重定向匹配的入站流量到指定的內部主機"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:286
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
msgid "Refuse forward"
msgstr "拒絕轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
msgid "Refuse input"
msgstr "拒絕入站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:276
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
msgid "Refuse output"
msgstr "拒絕出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
@@ -512,20 +591,20 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
msgid "Restart Firewall"
msgstr "重啟防火牆"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 動態偽裝的目標子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:165
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 動態偽裝的源子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:175
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
+#: 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
msgid "Restrict to address family"
msgstr "限制位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:48
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分載"
@@ -537,71 +616,71 @@ msgstr "規則已禁用"
msgid "Rule is enabled"
msgstr "規則已啟用"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Saturday"
msgstr "星期六"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:56
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
msgid "Software based offloading for routing/NAT"
msgstr "基於軟體的 Routing/NAT 分載"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:55
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Software flow offloading"
msgstr "軟體流量分載"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
msgid "Source IP address"
msgstr "源 IP 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:247
+#: 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
msgid "Source MAC address"
msgstr "源 MAC 位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
msgid "Source address"
msgstr "源位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:269
+#: 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
msgid "Source port"
msgstr "源埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
+#: 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
msgid "Source zone"
msgstr "源區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日期(yyyy-mm-dd)"
-#: 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:358
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:360
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
msgid "Sunday"
msgstr "星期日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:24
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
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:155
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: 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
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -615,7 +694,7 @@ msgstr ""
"strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的,例如:一條允許"
"從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:81
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
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 "
@@ -627,31 +706,31 @@ msgstr ""
"域入站和出站流量的預設策略,<em>轉發</em>選項描述該區域內不同網路之間的流量轉"
"發策略。<em>覆蓋網路</em>指定從屬於這個區域的網路。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Thursday"
msgstr "星期四"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:364
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
msgid "Time in UTC"
msgstr "UTC 時間"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
msgid "To %s at %s on <var>this device</var>"
msgstr "到 %s 在 %s 位於<var>本裝置</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
msgid "To %s in %s"
msgstr "到 %s 位於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:97
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
msgid "To %s on <var>this device</var>"
msgstr "到 %s 位於<var>本裝置</var>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位於 %s"
@@ -663,12 +742,12 @@ msgstr "到源 IP"
msgid "To source port"
msgstr "到源埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
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 "
@@ -677,109 +756,121 @@ msgstr ""
"通訊規則定義了不同區域間的資料包傳輸策略,例如:拒絕一些主機之間的通訊,開放"
"路由器 WAN 上的埠。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
msgid "Tuesday"
msgstr "星期二"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:106
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:110
+#: 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
msgid "Unnamed forward"
msgstr "未命名轉發"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:143
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:147
+#: 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
msgid "Unnamed rule"
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:99
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+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
+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"
msgstr "通過 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
msgid "Via %s at %s"
msgstr "通過 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:335
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:327
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:96
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
msgid "Zone ⇒ Forwardings"
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:78
msgid "Zones"
msgstr "區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
-#: 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:112
+#: 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
msgid "accept"
msgstr "接受"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
+#: 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:243
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:250
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:261
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:298
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:309
+#: 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
msgid "any"
msgstr "所有"
-#: 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:127
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:57
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:84
+#: 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/rules.js:58
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
msgstr "所有主機"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:65
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
msgid "any router IP"
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:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:126
+#: 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/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "所有區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:258
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:321
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
msgid "don't track"
msgstr "不跟蹤"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:318
-#: 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:111
+#: 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
msgid "drop"
msgstr "丟棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:256
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
msgid "hour"
msgstr "小時"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
msgid "minute"
msgstr "分鐘"
@@ -801,13 +892,13 @@ msgstr "埠"
msgid "ports"
msgstr "埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:320
-#: 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:110
+#: 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
msgid "reject"
msgstr "拒絕"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
msgid "second"
msgstr "秒"
@@ -822,6 +913,9 @@ msgstr "型別"
msgid "types"
msgstr "型別"
+#~ msgid "Output zone"
+#~ msgstr "出站區域"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(未命名條目)"
@@ -834,9 +928,6 @@ msgstr "型別"
#~ msgid "Destination IP address"
#~ msgstr "目標 IP 位址"
-#~ msgid "IPv6"
-#~ msgstr "IPv6"
-
#~ msgid "Inter-Zone Forwarding"
#~ msgstr "埠觸發"
diff --git a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
index 0a35b2068..265367eae 100644
--- a/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
+++ b/applications/luci-app-https_dns_proxy/po/es/https_dns_proxy.po
@@ -12,42 +12,40 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
-msgid "Group name"
-msgstr "Nombre del grupo"
-
#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
msgid "HTTPS DNS Proxy"
msgstr "Proxy DNS HTTPS"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:40
msgid "HTTPS DNS Proxy Settings"
msgstr "Configuración de proxy HTTPS DNS"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:43
msgid "Instances"
msgstr "Instancias"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
msgid "Listen address"
msgstr "Escuchar direccion"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:87
msgid "Listen port"
msgstr "Escuchar puerto"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:57
msgid "Provider"
msgstr "Proveedor"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:103
msgid "Proxy server"
msgstr "Servidor proxy"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:99
msgid "Subnet address"
msgstr "Direccion de subred"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "User name"
-msgstr "Nombre de usuario"
+#~ msgid "Group name"
+#~ msgstr "Nombre del grupo"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de usuario"
diff --git a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
index 41f60e248..8bfa1b923 100644
--- a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
+++ b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
@@ -1,42 +1,34 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
-msgid "Group name"
-msgstr ""
-
#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
msgid "HTTPS DNS Proxy"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:40
msgid "HTTPS DNS Proxy Settings"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:43
msgid "Instances"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
msgid "Listen address"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:87
msgid "Listen port"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:57
msgid "Provider"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:103
msgid "Proxy server"
msgstr ""
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:99
msgid "Subnet address"
msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "User name"
-msgstr ""
diff --git a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
index 91a45b025..565c95020 100644
--- a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
+++ b/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
@@ -15,42 +15,40 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
-msgid "Group name"
-msgstr "组名称"
-
#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
msgid "HTTPS DNS Proxy"
msgstr "HTTPS DNS 代理"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:40
msgid "HTTPS DNS Proxy Settings"
msgstr "HTTPS DNS 代理设置"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:43
msgid "Instances"
msgstr "实例"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
msgid "Listen address"
msgstr "监听地址"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:87
msgid "Listen port"
msgstr "监听端口"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:57
msgid "Provider"
msgstr "提供商"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:103
msgid "Proxy server"
msgstr "代理服务器"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:99
msgid "Subnet address"
msgstr "子网地址"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "User name"
-msgstr "用户名"
+#~ msgid "Group name"
+#~ msgstr "组名称"
+
+#~ msgid "User name"
+#~ msgstr "用户名"
diff --git a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
index 7d893fcf8..ad4c56fa3 100644
--- a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
+++ b/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
@@ -15,42 +15,40 @@ msgstr ""
"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
-msgid "Group name"
-msgstr "組名稱"
-
#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
msgid "HTTPS DNS Proxy"
msgstr "HTTPS DNS 代理"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:40
msgid "HTTPS DNS Proxy Settings"
msgstr "HTTPS DNS 代理設定"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:43
msgid "Instances"
msgstr "例項"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
msgid "Listen address"
msgstr "監聽位址"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:87
msgid "Listen port"
msgstr "監聽埠"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:57
msgid "Provider"
msgstr "提供商"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:103
msgid "Proxy server"
msgstr "代理伺服器"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:99
msgid "Subnet address"
msgstr "子網位址"
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
-msgid "User name"
-msgstr "使用者名稱"
+#~ msgid "Group name"
+#~ msgstr "組名稱"
+
+#~ msgid "User name"
+#~ msgstr "使用者名稱"
diff --git a/applications/luci-app-nut/po/es/nut.po b/applications/luci-app-nut/po/es/nut.po
index 615da00ca..c46ab6201 100644
--- a/applications/luci-app-nut/po/es/nut.po
+++ b/applications/luci-app-nut/po/es/nut.po
@@ -440,8 +440,7 @@ msgstr "Reemplace el mensaje de la batería"
#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
msgid "Require SSL and make sure server CN matches hostname"
msgstr ""
-"Requiere SSL y asegúrese de que el servidor CN coincida con el nombre de "
-"host"
+"Requiere SSL y asegúrese de que el servidor CN coincida con el nombre de host"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
msgid "Retry Delay"
@@ -525,8 +524,7 @@ msgstr "El nombre de esta sección se usará como nombre de UPS en otra parte"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
msgid "Time in seconds between driver start retry attempts."
msgstr ""
-"Tiempo en segundos entre los intentos de reintento de inicio del "
-"controlador."
+"Tiempo en segundos entre los intentos de reintento de inicio del controlador."
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
msgid "Time in seconds that upsdrvctl will wait for driver to finish starting"
diff --git a/applications/luci-app-olsr-viz/po/es/olsr-viz.po b/applications/luci-app-olsr-viz/po/es/olsr-viz.po
index 61c914287..a4016c83c 100644
--- a/applications/luci-app-olsr-viz/po/es/olsr-viz.po
+++ b/applications/luci-app-olsr-viz/po/es/olsr-viz.po
@@ -18,4 +18,5 @@ msgstr "OLSR-Viz"
#: applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm:4
msgid "You need to allow javascript in your browser to show this page."
-msgstr "Necesitas permitir javascript en tu navegador para mostrar esta página."
+msgstr ""
+"Necesitas permitir javascript en tu navegador para mostrar esta página."
diff --git a/applications/luci-app-openvpn/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po
index b9174f6f9..f47a31036 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Surt en fallar la negociació TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Requereix una designació explícita al certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Temps d'espera de retransmissió en canal de control TLS"
@@ -713,6 +713,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Xifrador TLS"
@@ -740,16 +744,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -759,11 +763,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 a9375f10d..f4dc19908 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -707,6 +707,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS šifra"
@@ -734,16 +738,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -753,11 +757,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 697c87f3c..890dd6df7 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr "%s"
@@ -38,7 +38,7 @@ msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
msgid "Check peer certificate against a CRL"
msgstr "Teilnehmerzertifikat mit Sperrliste abgleichen"
@@ -191,7 +191,7 @@ 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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
msgid "Don't cache --askpass or --auth-user-pass passwords"
msgstr "Authentifikationsdaten nicht zwischenspeichern"
@@ -269,7 +269,7 @@ msgstr "Administratorschnittstelle aktivieren"
msgid "Enabled"
msgstr "Einschalten"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
msgid "Encrypt and authenticate all control channel packets with the key"
msgstr ""
@@ -301,11 +301,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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
msgid "Get PEM password from controlling tty before we daemonize"
msgstr "PEM-Passwort von Konsole abfragen"
@@ -351,7 +351,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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
msgid "Key transition window"
msgstr "Maximaler Zeitraum für Schlüsselwechsel"
@@ -393,7 +393,7 @@ msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
msgid "OVPN configuration file upload"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
msgid "Only accept connections from given X509 name"
msgstr "Nur Verbindungen vom angegebenem X.509 Name zulassen"
@@ -504,15 +504,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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
msgid "Renegotiate data chan. key after seconds"
msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
@@ -520,11 +520,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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Verwendungszweck von Zertifikaten überprüfen"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
msgid "Require explicit key usage on certificate"
msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
@@ -532,11 +532,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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS Timeout"
@@ -718,6 +718,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS Verschlüsselungsalgorithmus"
@@ -745,16 +749,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -764,11 +768,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 92d55bb46..359739618 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -712,6 +712,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -739,16 +743,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -758,11 +762,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 a26bfe93b..61925d476 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Exit on TLS negotiation failure"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegotiate data chan. key after bytes"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr "Renegotiate data chan. key after packets"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Require explicit designation on certificate"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmit timeout on TLS control channel"
@@ -710,6 +710,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS cipher"
@@ -737,16 +741,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -756,11 +760,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 477de3619..e1f22acb6 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Salir si falla la negociación"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Designación explícita de certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
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:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Espera de retransmisión en el canal de control TLS"
@@ -721,6 +721,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Cifrado TLS"
@@ -751,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:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
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:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr "La versión TLS más baja soportada"
@@ -772,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:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
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:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 24fbee815..243bcdf48 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
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:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Exiger l'appellation explicite sur le certificat"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Renvoyer l'expiration du délai sur le canal de contrôle TLS"
@@ -732,6 +732,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Méthode de chiffrement TLS"
@@ -759,16 +763,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -778,11 +782,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 17a73ddfd..ff4022e9d 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,6 +705,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -732,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -751,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 1684fb548..51d2218df 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -709,6 +709,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS titkosító"
@@ -736,16 +740,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -755,11 +759,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 07e65baf5..f15ec1549 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -711,6 +711,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -738,16 +742,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -757,11 +761,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 335379a7d..e8f5403fe 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -709,6 +709,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS 暗号化方式"
@@ -736,16 +740,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -755,11 +759,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 d8d6a4414..0ffe3fb72 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,6 +704,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -731,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -750,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 17a73ddfd..ff4022e9d 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,6 +705,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -732,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -751,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 cd23c2169..1bfc504e3 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Wyjdź przy niepowodzeniu negocjacji TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr "Renegocjacja danych charakteru klucza po bajtach"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr "Renegocjacja danych charakteru klucza po pakietach"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Potrzebna Podpis na Certyfikacie"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmisja po upływie czasu TLS na kanale kontrolnym"
@@ -724,6 +724,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Kodowanie TLS"
@@ -751,16 +755,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -770,11 +774,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 cdf1d990d..4efb08a2f 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Fechar quando existir falha na negociacao TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Requerer designação específica no certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Estouro de tempo de retransmissão no canal de controle TLS"
@@ -717,6 +717,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Cifra TLS"
@@ -744,16 +748,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
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:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr "A mais baixa versão suporta do TLS"
@@ -763,11 +767,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 bceaf376d..ed017714b 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
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:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Requerer designação específica no certificado"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Timeout de retransmissão no canal de controlo TLS"
@@ -717,6 +717,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Cifra TLS"
@@ -744,16 +748,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -763,11 +767,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 e925bbaee..45ff97e43 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -35,7 +35,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -706,6 +706,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -733,16 +737,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -752,11 +756,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 64139efb3..2186c1e06 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "Выйти при ошибке согласования использования протокола TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
"Повторное согласование ключа канала данных после отправки или получения n "
"байт (по умолчанию отключено)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
"Повторное согласование ключа канала данных после отправки и получения n "
"пакетов (по умолчанию отключено)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "Требовать явного указания в сертификате"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "Ограничить разрешенные шифры согласования"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
"Пакет ретранслирует тайм-аут на канале управления протокола TLS, если нет "
@@ -794,6 +794,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "Алгоритм шифрования TLS"
@@ -821,16 +825,16 @@ msgid ""
"configuration."
msgstr "OPVN файл (%s) не найден, проверьте вашу конфигурацию."
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr "Самая высокая поддерживаемая версия протокола TLS"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr "Самая низкая поддерживаемая версия протокола TLS"
@@ -842,11 +846,11 @@ msgstr ""
"Размер OPVN файла (%s) слишком большой для онлайн редактирования в LuCI (&ge "
"100 Кб)"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr "Отключение механизма согласования шифров"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 7913d6f06..485ecad62 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,6 +704,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -731,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -750,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 25fdceb1d..ec7a65933 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -705,6 +705,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -732,16 +736,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -751,11 +755,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 d518696e7..b43be441f 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -697,6 +697,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -724,16 +728,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -743,11 +747,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 6bef476bd..29cf48a6d 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -704,6 +704,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -731,16 +735,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -750,11 +754,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 e17d10764..18a30f0e8 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
msgid "%s"
msgstr ""
@@ -37,7 +37,7 @@ msgstr ""
msgid "Add template based configuration"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr ""
@@ -708,6 +708,10 @@ msgstr ""
msgid "TCP/UDP port # for remote (default=1194)"
msgstr ""
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr ""
@@ -735,16 +739,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -754,11 +758,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 b8c6d3ac8..92245cf55 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
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:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
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:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
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:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
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:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "Retransmit timeout trên kênh kiểm soát TLS"
@@ -710,6 +710,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS cipher"
@@ -737,16 +741,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr ""
@@ -756,11 +760,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 40b920dc9..0c8aff383 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "TLS 验证失败后退出"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr "传输若干字节后重新验证数据通道密钥"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr "传输若干数据包后重新验证数据通道密钥"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "证书需要显式指定"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr "限定协商时允许的密码算法"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS 控制通道超时后重新发送"
@@ -713,6 +713,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS 加密"
@@ -740,16 +744,16 @@ msgid ""
"configuration."
msgstr "无法找到 OVPN 配置文件(%s),请检查您的配置。"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr "最高支持的 TLS 版本"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr "最低支持的 TLS 版本"
@@ -759,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:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr "这将完全禁用密码协商"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
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 e1768ef88..ecc45bab4 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:794
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:797
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
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:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
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:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
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:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
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:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
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:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
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:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
msgid "Exit on TLS negotiation failure"
msgstr "TLS 驗證失敗後退出"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
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:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
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:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
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:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
msgid "Renegotiate data chan. key after bytes"
msgstr "傳輸若干位元組後重新驗證資料通道金鑰"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
msgid "Renegotiate data chan. key after packets"
msgstr "傳輸若干資料包後重新驗證資料通道金鑰"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
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:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
msgid "Require explicit designation on certificate"
msgstr "證書需要顯式指定"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
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:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
msgid "Restrict the allowed ciphers to be negotiated"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
msgid "Retransmit timeout on TLS control channel"
msgstr "TLS 控制通道超時後重新發送"
@@ -713,6 +713,10 @@ 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
+msgid "TLS 1.3 or newer cipher"
+msgstr ""
+
#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
msgid "TLS cipher"
msgstr "TLS 加密"
@@ -740,16 +744,16 @@ msgid ""
"configuration."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
msgid "The highest supported TLS version"
msgstr "最高支援的 TLS 版本"
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
#: 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:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
msgid "The lowest supported TLS version"
msgstr "最低支援的 TLS 版本"
@@ -759,11 +763,11 @@ msgid ""
"LuCI (&ge; 100 KB)."
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
msgid "This completely disables cipher negotiation"
msgstr ""
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
msgid "Timeframe for key exchange"
msgstr "金鑰交換時間表"
diff --git a/applications/luci-app-wireguard/po/de/wireguard.po b/applications/luci-app-wireguard/po/de/wireguard.po
index 64aa77eec..e8edc2c15 100644
--- a/applications/luci-app-wireguard/po/de/wireguard.po
+++ b/applications/luci-app-wireguard/po/de/wireguard.po
@@ -1,88 +1,107 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "Erlaubte IPs"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "Sammle Daten..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "Konfiguration"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "Daten erhalten"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "Daten gesendet"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "Endpunkt"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "Schnittstelle"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "Schnittstelle besitzt keinen public key!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "Letztes Handshake"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "Port (lauschen)"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "Niemals"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr "Zeige/Verstecke QR-Code"
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "h zuvor"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "m zuvor"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "seit über"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "s zuvor"
diff --git a/applications/luci-app-wireguard/po/es/wireguard.po b/applications/luci-app-wireguard/po/es/wireguard.po
index 3179d39ba..08804c356 100644
--- a/applications/luci-app-wireguard/po/es/wireguard.po
+++ b/applications/luci-app-wireguard/po/es/wireguard.po
@@ -12,88 +12,107 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "IPs permitidas"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "Recolectando datos..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "Configuración"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "Datos recibidos"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "Datos transmitidos"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "Punto final"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "Marca de Firewall"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "Interfaz"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "¡La interfaz no tiene una clave pública!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "Último Handshake"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "Escuchar puerto"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "Nunca"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "Par"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Mantener conectado continuamente"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "Clave pública"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr "Mostrar/Ocultar código QR"
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "WireGuard"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "hace h"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "hace m"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "hace más de un día"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "hace s"
diff --git a/applications/luci-app-wireguard/po/ja/wireguard.po b/applications/luci-app-wireguard/po/ja/wireguard.po
index 965fac3cf..188ea24b2 100644
--- a/applications/luci-app-wireguard/po/ja/wireguard.po
+++ b/applications/luci-app-wireguard/po/ja/wireguard.po
@@ -13,88 +13,107 @@ msgstr ""
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "許可されたIP"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "データ収集中です..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "設定"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "受信済みデータ"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "送信済みデータ"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "エンドポイント"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "ファイアウォール マーク"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "インターフェース"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "インターフェースに公開鍵がありません!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "最新のハンドシェイク"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "待ち受けポート"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "無し"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "ピア"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "永続的なキープアライブ"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "公開鍵"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr ""
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "WireGuard ステータス"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "時間前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "分前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "1日以上前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "秒前"
diff --git a/applications/luci-app-wireguard/po/pt-br/wireguard.po b/applications/luci-app-wireguard/po/pt-br/wireguard.po
index 9aea136e1..a915ec303 100644
--- a/applications/luci-app-wireguard/po/pt-br/wireguard.po
+++ b/applications/luci-app-wireguard/po/pt-br/wireguard.po
@@ -12,88 +12,107 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "Endereços IP autorizados"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "Coletando dados..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "Configuração"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "Dados Recebidos"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "Dados Enviados"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "Equipamento do ponto final"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "Marca do Firewall"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "Interface"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "A interface não tem uma chave pública!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "Última Negociação"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "Porta de Escuta"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "Nunca"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "Parceiro"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Manter Conexões Abertas (Keepalive)"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "Chave Pública"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr ""
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "Estado do WireGuard"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "horas atrás"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "meses atrás"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "mais de um dia atrás"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "segundos atrás"
diff --git a/applications/luci-app-wireguard/po/ru/wireguard.po b/applications/luci-app-wireguard/po/ru/wireguard.po
index 8f2ad30f4..7bb88c456 100644
--- a/applications/luci-app-wireguard/po/ru/wireguard.po
+++ b/applications/luci-app-wireguard/po/ru/wireguard.po
@@ -13,88 +13,107 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "Разрешенные IP-адреса"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "Сбор данных..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "Настройка config файла"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "Полученные данные"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "Переданные данные"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "Конечная точка"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "Метка межсетевого экрана"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "Интерфейс"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "Интерфейс не имеет Публичного Ключа!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "Последний Хендшейк"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "Порт для входящих соединений"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "Никогда"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "Узел"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Постоянные Проверки Активности"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "Публичный Ключ"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr ""
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "Состояние WireGuard"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "час назад"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "минуту назад"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "более суток назад"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "секунду назад"
diff --git a/applications/luci-app-wireguard/po/sv/wireguard.po b/applications/luci-app-wireguard/po/sv/wireguard.po
index 80e18e694..cf4999c50 100644
--- a/applications/luci-app-wireguard/po/sv/wireguard.po
+++ b/applications/luci-app-wireguard/po/sv/wireguard.po
@@ -1,88 +1,107 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "Tillåtna IP-adresser"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "Samlar in data..."
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "Konfiguration"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "Mottagen data"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "Överförd data"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "Slutpunkt"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "Brandväggsmarkering"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "Gränssnitt"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "Gränssnittet har inte en publik nyckel!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "Senaste handskakning"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "Lyssningsport"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "Aldrig"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "Jämlike"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Hålla vid liv ständigt"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "Publik nyckel"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr ""
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "Status för WireGuard"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "t sedan"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "m sedan"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "över en dag sedan"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "s sedan"
diff --git a/applications/luci-app-wireguard/po/templates/wireguard.pot b/applications/luci-app-wireguard/po/templates/wireguard.pot
index 28fa83353..597458934 100644
--- a/applications/luci-app-wireguard/po/templates/wireguard.pot
+++ b/applications/luci-app-wireguard/po/templates/wireguard.pot
@@ -1,88 +1,107 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr ""
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr ""
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr ""
diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
index 1c5d2410d..c02e34664 100644
--- a/applications/luci-app-wireguard/po/zh-cn/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
@@ -15,88 +15,107 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: zh_CN\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "允许的 IP"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "正在收集数据…"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "已接收"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "已发送"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "传输端点"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "防火墙标识"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "接口"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "接口没有配置公钥!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "上次握手"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "监听端口"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "从不"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "对端"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Keepalive 间隔(秒)"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "公钥"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr "显示/隐藏 QR 码"
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "WireGuard 状态"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "小时前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "分钟前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "超过一天前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "秒前"
diff --git a/applications/luci-app-wireguard/po/zh-tw/wireguard.po b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
index 53f26d9fa..e1ab11209 100644
--- a/applications/luci-app-wireguard/po/zh-tw/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
@@ -15,88 +15,107 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: zh_CN\n"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
msgid "Allowed IPs"
msgstr "允許的 IP"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:222
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:256
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
msgid "Collecting data..."
msgstr "正在收集資料…"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:217
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:178
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:170
msgid "Data Received"
msgstr "已接收"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:179
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:171
msgid "Data Transmitted"
msgstr "已傳送"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:152
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:144
msgid "Endpoint"
msgstr "傳輸端點"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
msgid "Firewall Mark"
msgstr "防火牆標識"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:197
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
msgid "Interface"
msgstr "介面"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:124
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:116
msgid "Interface does not have a public key!"
msgstr "介面沒有配置公鑰!"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:174
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:166
msgid "Latest Handshake"
msgstr "上次握手"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:133
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
msgstr "監聽埠"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"
msgstr "從不"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:248
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
msgid "Peer"
msgstr "對端"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:164
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:156
msgid "Persistent Keepalive"
msgstr "Keepalive 間隔(秒)"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:127
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:147
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:119
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:139
msgid "Public Key"
msgstr "公鑰"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:191
msgid "Show/Hide QR-Code"
msgstr "顯示/隱藏 QR 碼"
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:211
+msgid ""
+"The QR-Code works per wg interface, it will be refreshed with every manual "
+"page reload and transfers the following information:"
+msgstr ""
+
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
msgstr "WireGuard 狀態"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:99
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:212
+msgid ""
+"[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
+"saved on the router"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
+msgid ""
+"[Peer] The 'PublicKey' of that wg interface and the 'AllowedIPs' with the "
+"default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
+"address"
+msgstr ""
+
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
msgid "h ago"
msgstr "小時前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:97
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:89
msgid "m ago"
msgstr "分鐘前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:101
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:93
msgid "over a day ago"
msgstr "超過一天前"
-#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:95
+#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:87
msgid "s ago"
msgstr "秒前"